Changeset 687 in tmcsimulator for trunk/src/python/unifiedlogger/activitylog_watcher.py

Timestamp:

10/02/2022 10:32:42 AM (4 years ago)

Author:

jdalbey

Message:

logging_service.py, et.al. Revise how it handles a missing CADcomments.log file - just skip the file read but continue. Also update all watchers to use config dir.

File:

• trunk/src/python/unifiedlogger/activitylog_watcher.py (modified) (4 diffs)

trunk/src/python/unifiedlogger/activitylog_watcher.py

@@ -34 +34 @@
 file1length = 0
 file2length = 0
+configdir = "config"  # default dir for production
 
 # Utility functions
@@ -42 +43 @@
 # get path to input file from configuration
 def getLogFilePath():
+    global configdir
     config = ConfigParser.ConfigParser()
-    config.read('config/logging_service.cfg')
+    config.read(configdir+'/logging_service.cfg')
     return config.get('Paths', 'ActivityLogPath')
 
@@ -50 +52 @@
 # jdalbey 2022.9.1
 def getLogFilenames():
+    global configdir
     config = ConfigParser.ConfigParser()
-    config.read('config/logging_service.cfg')
+    config.read(configdir+'/logging_service.cfg')
     file1 = config.get('Files','ActivityLogDataFilename')
     file2 = config.get('Files','ActivityLogSummaryFilename')
@@ -124 +127 @@
     return resultList
 
-def setup():
-    # nothing needed for setup
+def setup(dir):
+    global configdir
+    configdir = dir
     return
 
 # Local main for unit testing
 def main():
-    setup()
+    setup("config/devlinux")
     # Loop Forever, checking every five seconds
     while True: