Changeset 1772 for trunk/pylucid_project/PyLucid/middlewares/pagestats.py

Timestamp:

09/24/08 15:42:35 (18 months ago)

Author:

JensDiemer

Message:

bugfix for "pagestats - queries number" -  http://trac.pylucid.net/ticket/229

Files:

• trunk/pylucid_project/PyLucid/middlewares/pagestats.py (modified) (5 diffs)

trunk/pylucid_project/PyLucid/middlewares/pagestats.py

@@ -9 +9 @@
 
     Based on http://code.djangoproject.com/wiki/PageStatsMiddleware
+    
+    database queries
+    ~~~~~~~~~~~~~~~~
+    We display only the the database queries count if debug is on. Otherwise
+    the database cursor doesn't count the sql statements and we always get 0 ;)
+    
+    TODO:
+    ~~~~~
+    Put settings for debug_sql_queries() into settings.py:
+        http://trac.pylucid.net/ticket/230
 
     Last commit info:
@@ -22 +32 @@
 from time import time
 
+from django.conf import settings
 from django.db import connection
 
@@ -32 +43 @@
 TAG = u"<!-- script_duration -->"
 
-FMT = (
-    u'render time: %(total_time)s -'
-    ' overall: %(overall_time)s -'
-    ' queries: %(queries)d'
-)
+# used if settings.DEBUG is off:
+FMT = u"render time: %(total_time)s - overall: %(overall_time)s"
+# used if settings.DEBUG is on:
+FMT_DEBUG = FMT + u" - queries: %(queries)d"
+
 
 class PageStatsMiddleware(object):
@@ -44 +55 @@
         """
         self.start_time = time()
-        # get number of db queries before we do anything
-        self.old_queries = len(connection.queries)
+        if settings.DEBUG:
+            # get number of db queries before we do anything
+            self.old_queries = len(connection.queries)
 
     def process_response(self, request, response):
@@ -56 +68 @@
             return response
 
-        # compute the db time for the queries just run
-        # FIXME: In my shared webhosting environment the queries is always = 0
-        queries = len(connection.queries) - self.old_queries
+        context = {
+            'total_time' : human_duration(time() - self.start_time),
+            'overall_time' : human_duration(time() - start_overall),
+        }
 
-        total_time = human_duration(time() - self.start_time)
-        overall_time = human_duration(time() - start_overall)
-
-        # replace the comment if found
-        stat_info = FMT % {
-            'total_time' : total_time,
-            'overall_time' : overall_time,
-            'queries' : queries,
-        }
+        if settings.DEBUG:
+            # compute the db time for the queries just run, this information is
+            # only available if the debug cursor used
+            context["queries"] = len(connection.queries) - self.old_queries
+            stat_info = FMT_DEBUG % context
+        else:
+            # Used the template without queries
+            stat_info = FMT % context
 
         # insert the page statistic