From 2ea1945d12c16fbd0584f007221bf6f4e8b4e84b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Sun, 6 Aug 2017 15:51:05 +0000
Subject: [PATCH] Fix loading of conext-dependant Django middleware

---
 mygpo/settings.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/mygpo/settings.py b/mygpo/settings.py
index a6cec47e..2cc7e2ca 100644
--- a/mygpo/settings.py
+++ b/mygpo/settings.py
@@ -153,9 +153,10 @@ INSTALLED_APPS = [
 ]
 
 try:
-    import debug_toolbar
-    INSTALLED_APPS += ['debug_toolbar']
-    MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware']
+    if DEBUG:
+        import debug_toolbar
+        INSTALLED_APPS += ['debug_toolbar']
+        MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware']
 
 except ImportError:
     pass
@@ -167,11 +168,6 @@ try:
     if not DEBUG:
         INSTALLED_APPS += ['opbeat.contrib.django']
 
-        # add opbeat middleware to the beginning of the middleware classes list
-        MIDDLEWARE = \
-            ['opbeat.contrib.django.middleware.OpbeatAPMMiddleware'] + \
-            MIDDLEWARE
-
 except ImportError:
     pass
 
-- 
2.11.4.GIT