Projet

Général

Profil

0001-debian-import-fix-of-commit-69076a2-into-debian_conf.patch

Benjamin Dauvergne, 29 juin 2015 16:33

Télécharger (2,09 ko)

Voir les différences: 

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(-)
debian-wheezy/debian_config.py
32 32 
        'syslog': {
33 33 
            'format': '%(ip)s %(user)s %(request_id)s %(levelname)s %(name)s.%(funcName)s: %(message)s',
34 34 
        },
35 
        'syslog_db': {
36 
            'format': '[%(asctime)s] - - - %(levelname)s %(name)s.%(funcName)s: %(message)s',
37 
            'datefmt': '%Y-%m-%d %a %H:%M:%S'
38 
        },
35 39 
    },
36 40 
    'handlers': {
37 41 
        'syslog': {
......
41 45 
            'filters': ['cleaning', 'request_context'],
42 46 
            'formatter': 'syslog',
43 47 
        },
48 
	# remove request_context filter for db log to prevent infinite loop
49 
	# when logging sql query to retrieve the session user
50 
        'syslog_db': {
51 
            'level': 'DEBUG',
52 
            'address': '/dev/log',
53 
            'class': 'logging.handlers.SysLogHandler',
54 
            'filters': ['cleaning'],
55 
            'formatter': 'syslog_db',
56 
        },
44 57 
    },
45 58 
    'loggers': {
46 59 
        # even when debugging seeing SQL queries is too much, activate it
47 60 
        # explicitly using DEBUG_DB
48 61 
        'django.db': {
49 
                'handlers': ['syslog'],
62 
                'handlers': ['syslog_db'],
50 63 
                'level': 'INFO',
64 
                'propagate': False,
51 65 
        },
52 66 
        # django_select2 outputs debug message at level INFO
53 67 
        'django_select2': {
54 
-