From 6a8526a93b60ebae214dbe0d4cbf172c311802b9 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Sun, 10 Nov 2013 15:18:29 +0100
Subject: Remove Panel.disabled, always use Panel.enabled.

---
 debug_toolbar/middleware.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 7988fd5..4f5b9bd 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -92,9 +92,8 @@ class DebugToolbarMiddleware(object):
 
             toolbar = DebugToolbar(request)
             for panel in toolbar.panels:
-                panel.disabled = panel.dom_id() in request.COOKIES
-                panel.enabled = not panel.disabled
-                if panel.disabled:
+                panel.enabled = panel.dom_id() not in request.COOKIES
+                if not panel.enabled:
                     continue
                 panel.process_request(request)
             self.__class__.debug_toolbars[threading.current_thread().ident] = toolbar
@@ -106,7 +105,7 @@ class DebugToolbarMiddleware(object):
             return
         result = None
         for panel in toolbar.panels:
-            if panel.disabled:
+            if not panel.enabled:
                 continue
             response = panel.process_view(request, view_func, view_args, view_kwargs)
             if response:
@@ -134,7 +133,7 @@ class DebugToolbarMiddleware(object):
         if ('gzip' not in response.get('Content-Encoding', '') and
                 response.get('Content-Type', '').split(';')[0] in _HTML_TYPES):
             for panel in toolbar.panels:
-                if panel.disabled:
+                if not panel.enabled:
                     continue
                 panel.process_response(request, response)
             response.content = replace_insensitive(
-- 
cgit v1.2.3


From f92aba225936fa768c098a8f1db51125ac1715ec Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Sun, 10 Nov 2013 10:10:28 +0100
Subject: Disable instrumentation for disabled panels.

This eliminates the performance overhead when a panel is disabled.
---
 debug_toolbar/middleware.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 4f5b9bd..80e9305 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -95,6 +95,7 @@ class DebugToolbarMiddleware(object):
                 panel.enabled = panel.dom_id() not in request.COOKIES
                 if not panel.enabled:
                     continue
+                panel.enable_instrumentation()
                 panel.process_request(request)
             self.__class__.debug_toolbars[threading.current_thread().ident] = toolbar
 
@@ -130,12 +131,13 @@ class DebugToolbarMiddleware(object):
                     {'redirect_to': redirect_to}
                 )
                 response.cookies = cookies
+        for panel in toolbar.panels:
+            if not panel.enabled:
+                continue
+            panel.process_response(request, response)
+            panel.disable_instrumentation()
         if ('gzip' not in response.get('Content-Encoding', '') and
                 response.get('Content-Type', '').split(';')[0] in _HTML_TYPES):
-            for panel in toolbar.panels:
-                if not panel.enabled:
-                    continue
-                panel.process_response(request, response)
             response.content = replace_insensitive(
                 force_text(response.content, encoding=settings.DEFAULT_CHARSET),
                 self.tag,
-- 
cgit v1.2.3


From b9d2abfeddaaea4c70f75e0c19a40195740b009d Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Sun, 10 Nov 2013 16:02:24 +0100
Subject: Remove code that isn't used any more.

---
 debug_toolbar/middleware.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 80e9305..daea751 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -54,10 +54,6 @@ class DebugToolbarMiddleware(object):
     """
     debug_toolbars = {}
 
-    @classmethod
-    def get_current(cls):
-        return cls.debug_toolbars.get(threading.current_thread().ident)
-
     def __init__(self):
         self._urlconfs = {}
 
-- 
cgit v1.2.3