server instances also log onto stdout for journalctl to handle

[sfa.git] / sfa / util / sfalogging.py

diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py
index 5a9745c..9afc334 100644 (file)
--- a/sfa/util/sfalogging.py
+++ b/sfa/util/sfalogging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 """
 A reroutable logger that can handle deep tracebacks
@@ -34,7 +34,7 @@ Implementation:
 
 # pylint: disable=c0111, c0103, w1201
 
-from __future__ import print_function
+
 
 import os
 import os.path
@@ -121,9 +121,10 @@ logging.setLoggerClass(SfaLogger)
 # have the same set of keys
 def logging_config(context):
     if context == 'server':
-        handlername = 'file'
-        filename = '/var/log/sfa.log'
-        level = 'INFO'
+        # use stdout and let journalctl do the heavy lifting
+        handlername = 'stdout'
+        #filename = '/var/log/sfa.log'
+        level = 'DEBUG'
     elif context == 'import':
         handlername = 'file'
         filename = '/var/log/sfa-import.log'
@@ -134,7 +135,7 @@ def logging_config(context):
         level = 'DEBUG'
     elif context == 'console':
         handlername = 'stdout'
-        filename = 'ignored'
+        #filename = 'ignored'
         level = 'INFO'
     else:
         print("Cannot configure logging - exiting")
@@ -168,7 +169,7 @@ def logging_config(context):
             'level': level,
             'formatter': 'standard',
             'class': 'logging.StreamHandler',
-            }
+        }
     else:
         config['handlers']['file'] = {
             'filename': filename,
@@ -179,7 +180,7 @@ def logging_config(context):
             'when': 'w0',
             'interval': 1,
             'backupCount': 12,
-            }
+        }
     return config