From: Antony Chazapis <chazapis@gmail.com>
Date: Thu, 27 Oct 2011 12:00:02 +0000 (+0300)
Subject: Add logfile to settings.
X-Git-Tag: pithos/v0.7.9~9^2~1
X-Git-Url: https://code.grnet.gr/git/pithos/commitdiff_plain/ee1a761751b7f4a63ae6250c6aa3b0902fc41970

Add logfile to settings.
---

diff --git a/pithos/middleware/log.py b/pithos/middleware/log.py
index 88436c5..f6dcca3 100644
--- a/pithos/middleware/log.py
+++ b/pithos/middleware/log.py
@@ -40,8 +40,11 @@ import logging
 class LoggingConfigMiddleware:
     def __init__(self):
         '''Initialise the logging setup from settings, called on first request.'''
-        if getattr(settings, 'DEBUG', False):
-            logging.basicConfig(level = logging.DEBUG, filename='/tmp/pithos.log', format = '%(asctime)s [%(levelname)s] %(name)s %(message)s', datefmt = '%Y-%m-%d %H:%M:%S')
-        else:
-            logging.basicConfig(level = logging.INFO, filename='/tmp/pithos.log', format = '%(asctime)s [%(levelname)s] %(name)s %(message)s', datefmt = '%Y-%m-%d %H:%M:%S')
+        args = {}
+        args['level'] = logging.DEBUG if getattr(settings, 'DEBUG', False) else logging.INFO
+        if settings.LOGFILE:
+            args['filename'] = settings.LOGFILE
+        args['format'] = '%(asctime)s [%(levelname)s] %(name)s %(message)s'
+        args['datefmt'] = '%Y-%m-%d %H:%M:%S'
+        logging.basicConfig(**args)
         raise MiddlewareNotUsed('Logging setup only.')
diff --git a/pithos/settings.py.dist b/pithos/settings.py.dist
index bbaeb80..5a7267c 100644
--- a/pithos/settings.py.dist
+++ b/pithos/settings.py.dist
@@ -172,3 +172,6 @@ DEFAULT_FROM_EMAIL = 'Pithos <no-reply@grnet.gr>'
 INVITATION_LOGIN_TARGET = 'https://pithos.dev.grnet.gr/im/login/invitation' \
                             '?code=%d' \
                             '&next=https://pithos.dev.grnet.gr/ui'
+
+# Use to log to a file.
+LOGFILE = None