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

Timestamp:

09/01/2022 01:12:20 PM (4 years ago)

Author:

jdalbey

Message:

activitylog_watcher.py updated to read log filenames from config file.

File:

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

trunk/src/python/unifiedlogger/activitylog_watcher.py

@@ -45 +45 @@
     config.read('config/logging_service.cfg')
     return config.get('Paths', 'ActivityLogPath')
+
+# get data filenames from configuration
+# returns incident data filename, incident summary filename
+# jdalbey 2022.9.1
+def getLogFilenames():
+    config = ConfigParser.ConfigParser()
+    config.read('config/logging_service.cfg')
+    file1 = config.get('Files','ActivityLogDataFilename')
+    file2 = config.get('Files','ActivityLogSummaryFilename')
+    return file1,file2
     
 # Read the activty log entries 
 def readFile1():
-    logfilename = "incident_activity.json"   #"IncidentActivity.log"
+    logfilename = getLogFilenames()[0]  #"IncidentActivity.log"
     output = []
     try:  
@@ -64 +74 @@
 # It has a different format than incident_activity.json, so we put it in a separate function.
 def readFile2():
-    data_summary = "incident_description.json"
+    data_summary = getLogFilenames()[1] #"incident_description.json"
+
     output = []
     try: