From c3af8f97f9223a86a3534050483fe22708cfe1e4 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 29 Jun 2015 16:31:12 +0200
Subject: [PATCH] debian: import fix of commit 69076a2 into debian_config.py
 (fixes #7699)

	commit 69076a255a6cacfb623d951c9ca60106d6d7cc0c
	Author: Benjamin Dauvergne <bdauvergne@entrouvert.com>
	Date:   Tue Apr 28 01:08:20 2015 +0200

	    settings.py: make a special handler for DB logs as the request_context filter could create infinite loops

	    fixes #7247
---
 debian-wheezy/debian_config.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian-wheezy/debian_config.py b/debian-wheezy/debian_config.py
index ee4612d..bdc1e20 100644
--- a/debian-wheezy/debian_config.py
+++ b/debian-wheezy/debian_config.py
@@ -32,6 +32,10 @@ LOGGING = {
         'syslog': {
             'format': '%(ip)s %(user)s %(request_id)s %(levelname)s %(name)s.%(funcName)s: %(message)s',
         },
+        'syslog_db': {
+            'format': '[%(asctime)s] - - - %(levelname)s %(name)s.%(funcName)s: %(message)s',
+            'datefmt': '%Y-%m-%d %a %H:%M:%S'
+        },
     },
     'handlers': {
         'syslog': {
@@ -41,13 +45,23 @@ LOGGING = {
             'filters': ['cleaning', 'request_context'],
             'formatter': 'syslog',
         },
+	# remove request_context filter for db log to prevent infinite loop
+	# when logging sql query to retrieve the session user
+        'syslog_db': {
+            'level': 'DEBUG',
+            'address': '/dev/log',
+            'class': 'logging.handlers.SysLogHandler',
+            'filters': ['cleaning'],
+            'formatter': 'syslog_db',
+        },
     },
     'loggers': {
         # even when debugging seeing SQL queries is too much, activate it
         # explicitly using DEBUG_DB
         'django.db': {
-                'handlers': ['syslog'],
+                'handlers': ['syslog_db'],
                 'level': 'INFO',
+                'propagate': False,
         },
         # django_select2 outputs debug message at level INFO
         'django_select2': {
-- 
2.1.4