Changeset 687 in tmcsimulator for trunk/src/python/unifiedlogger/cad_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/cad_watcher.py (modified) (3 diffs)

trunk/src/python/unifiedlogger/cad_watcher.py

@@ -11 +11 @@
 
 lastLineNum = 0
+configdir = "config"  # default dir for production
 
-def setup():
+def setup(dir):
+    global lastLineNum, configdir
     lastLineNum = 0
+    configdir = dir
     return
 
 # Retrieve new messages from CAD comment log 
 def getLogEntries():
-    global lastLineNum
+    global lastLineNum, configdir
     # get path to input file from configuration
     config = ConfigParser.ConfigParser()
-    config.read('config/logging_service.cfg')
+    config.read(configdir+'/logging_service.cfg')
     logfilepath  = config.get('Paths', 'UnifiedLogPath')
     pathToLog = logfilepath + "CADcomments.log"
@@ -29 +32 @@
     except IOError as ex:
         if ex.errno == 2:
-            # 'No such file or directory
-            print pathToLog + " missing: assuming reset."
-            lastLineNum = 0   #Start over
+            # 'No such file or directory'
+            # Assume this is a read sync problem: Don't modify lastLineNum
+            print pathToLog + " missing, skipping file read."
+            #lastLineNum = 0   #Start over
             return []
         else:
@@ -41 +45 @@
         fileSize = os.path.getsize(pathToLog)
         if fileSize == 0:
-            # Assume this is a read sync problem: Don't modify lastLineNum
-            print pathToLog+" is empty, ignoring."
+            print pathToLog+" is empty, skipping file read and resetting."
             lastLineNum = 0   #Start over
             return []
         else: # file is good, read it.
-            msgList = text_file.read().split('\n')
+            msgList = text_file.read().strip().split('\n')
             text_file.close()
             currList = []
             currList = msgList[lastLineNum:] # new items since last file read
-            lastLineNum = len(msgList)-1
+            lastLineNum = len(msgList)
             return currList
 
 # Local main for unit testing
 def main():
-    setup()
+    setup("config/devlinux")
     # Loop Forever, checking every five seconds
     while True: