From a08b62e0e1ee68feda7168dab624b7ef96b8c54e Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 13 Jun 2013 09:32:27 +0200
Subject: [PATCH] settings: fix new logging configuration

---
 appli_project/settings/commun.py | 11 +++++------
 appli_project/settings/dev.py    |  2 +-
 appli_project/settings/prod.py   |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/appli_project/settings/commun.py b/appli_project/settings/commun.py
index 4035352..7eb0a4c 100644
--- a/appli_project/settings/commun.py
+++ b/appli_project/settings/commun.py
@@ -1,9 +1,8 @@
-# vim:spell:spelllang=fr
 # -*- encoding: utf-8 -*-
 
 import os.path
-import django.conf.global_settings as DEFAULT_SETTINGS
-from logging.handlers import SysLogHandler
+import logging
+
 
 PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..')
 
@@ -226,7 +225,7 @@ CHANGE_EMAIL_FROM = INSCRIPTION_FROM_EMAIL
 ALERTE_FROM = INSCRIPTION_FROM_EMAIL
 VALIDATION_FROM = INSCRIPTION_FROM_EMAIL
 
-def LOGGING_FUNC(root):
+def LOGGING_FUNC(root, DEBUG):
     return {
     'version': 1,
     'disable_existing_loggers': True,
@@ -252,7 +251,7 @@ def LOGGING_FUNC(root):
         'syslog': {
             'level': 'DEBUG',
             'class': 'entrouvert.logging.handlers.SysLogHandler', 
-            'formatter': 'syslog_debug' if level == 'DEBUG' else 'syslog',
+            'formatter': 'syslog_debug' if DEBUG else 'syslog',
             'facility': logging.handlers.SysLogHandler.LOG_LOCAL0,
             'address': '/dev/log',
             'max_length': 999,
@@ -265,7 +264,7 @@ def LOGGING_FUNC(root):
             'handlers': ['syslog', 'mail_admins'],
         },
         '': {
-            'level': 'INFO',
+            'level': 'DEBUG' if DEBUG else 'INFO',
             'handlers': ['syslog', 'mail_admins'],
         },
     },
diff --git a/appli_project/settings/dev.py b/appli_project/settings/dev.py
index cb33791..e68ecde 100644
--- a/appli_project/settings/dev.py
+++ b/appli_project/settings/dev.py
@@ -16,7 +16,7 @@ ADMINS = (
 )
 
 MANAGERS = ADMINS
-LOGGING = LOGGING_FUNC(PROJECT_ROOT)
+LOGGING = LOGGING_FUNC(PROJECT_ROOT, DEBUG)
 
 try:
     from local_settings_dev import *
diff --git a/appli_project/settings/prod.py b/appli_project/settings/prod.py
index 42a2e37..ceb3ff2 100644
--- a/appli_project/settings/prod.py
+++ b/appli_project/settings/prod.py
@@ -14,7 +14,7 @@ ADMINS = (
 )
 
 MANAGERS = ADMINS
-LOGGING = LOGGING_FUNC('/var/log/logement')
+LOGGING = LOGGING_FUNC('/var/log/logement', DEBUG)
 MEDIA_ROOT = '/var/lib/logement/media/'
 STATIC_ROOT = '/var/lib/logement/static/'