Changeset 683 in tmcsimulator for trunk/src

Timestamp:

09/28/2022 10:58:59 AM (4 years ago)

Author:

jdalbey

Message:

Revised unified logger to accept an optional command line parameter specifying the directory that contains logging_service.cfg. Default is 'config' for production.

Location:

trunk/src/python/unifiedlogger

Files:

• __main__.py (modified) (2 diffs)
• logging_service.py (modified) (3 diffs)

trunk/src/python/unifiedlogger/__main__.py

@@ -1 @@
-import logging_service, os, ConfigParser
+import logging_service, os, sys, ConfigParser
 # This main module is provided so the application can be conveniently bundled for deployment
 def main():
@@ -10 +10 @@
         revNum = "?"
     print "Unified Logging Service v"+revNum,"starting from ",os.getcwd()
-    logging_service.startup()
+    logging_service.startup(sys.argv)
 
 if __name__ == '__main__':

trunk/src/python/unifiedlogger/logging_service.py

@@ -1 @@
-import cms_watcher, har_watcher, cad_watcher, activitylog_watcher, time, json, ConfigParser
+import sys, cms_watcher, har_watcher, cad_watcher, activitylog_watcher, time, json, ConfigParser
 # Unified Logging Service
 # jdalbey 7/6/2019
@@ -24 +24 @@
     return toHMS(seconds)
 
-def startup():
+# Entry point
+# @param list of command line arguments
+#        can provide name of config directory to use
+def startup(args):
+    configdir = "config"  # default dir for production
+    # See if a config dir was given on command line
+    if len(args) == 2:
+        configdir = args[1]
+
     # get path to output file from configuration
     config = ConfigParser.ConfigParser()
-    config.read('config/logging_service.cfg')
+    config.read(configdir + '/logging_service.cfg')
     logfilepath  = config.get('Paths', 'UnifiedLogPath')
     
@@ -79 +87 @@
 #END DO
 
+# for unit testing
 if __name__ == '__main__':
-    startup()
+    startup(sys.argv)