X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FLogger.py;h=6102972e29d94a7b1364cccc41e3f5abecedebd0;hb=e68365ae0a76902ee71d13a154ed5035b10e8109;hp=ca85ac9f67d485a49fba4d7cd987ad0eafcc1c74;hpb=fdc1bf78189188df147a882721805e7ed5654459;p=plcapi.git

diff --git a/PLC/Logger.py b/PLC/Logger.py
index ca85ac9..6102972 100644
--- a/PLC/Logger.py
+++ b/PLC/Logger.py
@@ -1,28 +1,40 @@
+# pylint: disable=c0103
+
+import os
 import logging
 import logging.config
 
 # we essentially need one all-purpose logger
 # that goes into /var/log/plcapi.log
 
+# for debugging
+global_filename = "/var/log/plcapi.log"
+if 'PLCAPILOG' in os.environ:
+    global_filename = os.environ['PLCAPILOG']
+else:
+    try:
+        with open(global_filename, 'a') as just_checking:
+            pass
+    except OSError:
+        global_filename = "/tmp/plcapi.log"
+
 plcapi_logging_config = {
-    'version' : 1,
-    'disable_existing_loggers' : True,
-    'formatters': { 
-        'standard': { 
-            'format': '%(asctime)s %(levelname)s %(filename)s:%(lineno)d %(message)s',
-            'datefmt': '%m-%d %H:%M:%S'
-        },
-        'shorter': { 
-            'format': '%(asctime)s %(levelname)s %(message)s',
-            'datefmt': '%d %H:%M:%S'
+    'version': 1,
+    # IMPORTANT: we may be imported by something else, like sfa, so:
+    'disable_existing_loggers': False,
+    'formatters': {
+        'standard': {
+            'datefmt': '%m-%d %H:%M:%S',
+            'format': ('%(asctime)s %(levelname)s '
+                       '%(filename)s:%(lineno)d %(message)s'),
         },
     },
     'handlers': {
         'plcapi': {
+            'filename': global_filename,
             'level': 'INFO',
             'class': 'logging.FileHandler',
             'formatter': 'standard',
-            'filename' : '/var/log/plcapi.log',
         },
     },
     'loggers': {