diff --git a/src/opengnsys/linux/log.py b/src/opengnsys/linux/log.py index 77617d6..0b447a3 100644 --- a/src/opengnsys/linux/log.py +++ b/src/opengnsys/linux/log.py @@ -53,13 +53,13 @@ class LocalLogger(object): for logDir in ('/var/log', os.path.expanduser('~'), tempfile.gettempdir()): try: fname1 = os.path.join (logDir, 'opengnsys.log') - fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s (%(threadName)s) (%(funcName)s) %(message)s') + fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s in_oglive=%(in_oglive)s (%(threadName)s) (%(funcName)s) %(message)s') fh1 = logging.FileHandler (filename=fname1, mode='a') fh1.setFormatter (fmt1) fh1.setLevel (logging.DEBUG) fname2 = os.path.join (logDir, 'opengnsys.json.log') - fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='') + fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "in_oglive": "in_oglive", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='') fh2 = logging.FileHandler (filename=fname2, mode='a') fh2.setFormatter (fmt2) fh2.setLevel (logging.DEBUG) diff --git a/src/opengnsys/windows/log.py b/src/opengnsys/windows/log.py index 5b322f4..e146e8f 100644 --- a/src/opengnsys/windows/log.py +++ b/src/opengnsys/windows/log.py @@ -50,13 +50,13 @@ class LocalLogger(object): # service wil get c:\windows\temp, while user will get c:\users\XXX\appdata\local\temp fname1 = os.path.join (tempfile.gettempdir(), 'opengnsys.log') - fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s (%(threadName)s) (%(funcName)s) %(message)s') + fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s in_oglive=%(in_oglive)s (%(threadName)s) (%(funcName)s) %(message)s') fh1 = logging.FileHandler (filename=fname1, mode='a') fh1.setFormatter (fmt1) fh1.setLevel (logging.DEBUG) fname2 = os.path.join (tempfile.gettempdir(), 'opengnsys.json.log') - fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='') + fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "in_oglive": "in_oglive", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='') fh2 = logging.FileHandler (filename=fname2, mode='a') fh2.setFormatter (fmt2) fh2.setLevel (logging.DEBUG)