Allow to easily specify the log filev2.0

1 files changed, 43 insertions, 38 deletions

diff --git a/settings.py b/settings.py
index eaeac4a..ca2b460 100644
--- a/settings.py
+++ b/settings.py
@@ -188,50 +188,55 @@ INSTALLED_APPS += [
 #   'chimere.scripts', # activate it if you want to use old migration scripts
 ]
 
-LOGGING = {'version': 1,
-     'disable_existing_loggers': False,
-    'handlers': {
-        # Include the default Django email handler for errors
-        # This is what you'd get without configuring logging at all.
-        'mail_admins': {
-            'class': 'django.utils.log.AdminEmailHandler',
-            'level': 'ERROR',
-            # But the emails are plain text by default - HTML is nicer
-            'include_html': True,
-        },
-        # Log to a text file that can be rotated by logrotate
-        'logfile': {
-            'class': 'logging.handlers.WatchedFileHandler',
-            'filename': '/var/log/django/chimere.log'
-        },
-    },
-    'loggers': {
-        # Again, default Django configuration to email unhandled exceptions
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-        # Might as well log any errors anywhere else in Django
-        'django': {
-            'handlers': ['logfile'],
-            'level': 'ERROR',
-            'propagate': False,
-        },
-        # Your own app - this assumes all your logger names start with "myapp."
-        'chimere': {
-            'handlers': ['logfile'],
-            'level': 'WARNING', # Or maybe INFO or DEBUG
-                'propogate': False
-        },
-    },
-}
+LOG_PATH = '/var/log/django/'
 
 try:
     from local_settings import *
 except ImportError, e:
     print 'Unable to load local_settings.py:', e
 
+if 'LOGGING' not in globals():
+    global LOGGING
+    LOGGING = {'version': 1,
+         'disable_existing_loggers': False,
+        'handlers': {
+            # Include the default Django email handler for errors
+            # This is what you'd get without configuring logging at all.
+            'mail_admins': {
+                'class': 'django.utils.log.AdminEmailHandler',
+                'level': 'ERROR',
+                # But the emails are plain text by default - HTML is nicer
+                'include_html': True,
+            },
+            # Log to a text file that can be rotated by logrotate
+            'logfile': {
+                'class': 'logging.handlers.WatchedFileHandler',
+                'filename': LOG_PATH + 'chimere.log'
+            },
+        },
+        'loggers': {
+            # Again, default Django configuration to email unhandled exceptions
+            'django.request': {
+                'handlers': ['mail_admins'],
+                'level': 'ERROR',
+                'propagate': True,
+            },
+            # Might as well log any errors anywhere else in Django
+            'django': {
+                'handlers': ['logfile'],
+                'level': 'ERROR',
+                'propagate': False,
+            },
+            # Your own app - this assumes all your logger names start with "myapp."
+            'chimere': {
+                'handlers': ['logfile'],
+                'level': 'WARNING', # Or maybe INFO or DEBUG
+                    'propogate': False
+            },
+        },
+    }
+
+
 if 'CHIMERE_SHARE_NETWORKS' not in globals():
     # after the locals to get the right STATIC_URL