Browse Source

[desktop] Remove the redundant database_logging option

This has been a part of Django since 1.3.
Erick Tryzelaar 10 years ago
parent
commit
253b9554e7

+ 0 - 3
desktop/conf/pseudo-distributed.ini.tmpl

@@ -22,9 +22,6 @@
 
   send_dbug_messages=1
 
-  # To show database transactions, set database_logging to 1
-  database_logging=0
-
   # Set this to a random string, the longer the better.
   # This is used for secure hashing in the session store.
   secret_key=

+ 0 - 6
desktop/core/src/desktop/conf.py

@@ -728,12 +728,6 @@ SEND_DBUG_MESSAGES = Config(
   default=False
 )
 
-DATABASE_LOGGING = Config(
-  key="database_logging",
-  help=_("If true, log all database requests."),
-  type=coerce_bool,
-  default=False)
-
 DJANGO_ADMINS = UnspecifiedConfigSection(
   key="django_admins",
   help=_("Administrators that should receive error emails."),

+ 0 - 20
desktop/core/src/desktop/middleware.py

@@ -365,26 +365,6 @@ class AuditLoggingMiddleware(object):
     return response
 
 
-class DatabaseLoggingMiddleware(object):
-  """
-  If configured, logs database queries for every request.
-  """
-  DATABASE_LOG = logging.getLogger("desktop.middleware.DatabaseLoggingMiddleware")
-
-  def __init__(self):
-    if not desktop.conf.DATABASE_LOGGING.get():
-      LOG.info('Unloading DatabaseLoggingMiddleware')
-      raise exceptions.MiddlewareNotUsed
-
-  def process_response(self, request, response):
-    if desktop.conf.DATABASE_LOGGING.get():
-      if self.DATABASE_LOG.isEnabledFor(logging.INFO):
-          # This only exists if desktop.settings.DEBUG is true, hence the use of getattr
-          for query in getattr(django.db.connection, "queries", []):
-            self.DATABASE_LOG.info("(%s) %s" % (query["time"], query["sql"]))
-    return response
-
-
 try:
   import tidylib
   _has_tidylib = True

+ 0 - 1
desktop/core/src/desktop/settings.py

@@ -121,7 +121,6 @@ TEMPLATE_LOADERS = (
 MIDDLEWARE_CLASSES = [
     # The order matters
     'desktop.middleware.EnsureSafeMethodMiddleware',
-    'desktop.middleware.DatabaseLoggingMiddleware',
     'desktop.middleware.AuditLoggingMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',