Changeset 439 in tmcsimulator for trunk/webapps

Timestamp:

07/11/2019 02:45:25 PM (7 years ago)

Author:

jdalbey

Message:

setup wing project for logging service python files. Add config file for file paths.

Location:

trunk/webapps/unifiedlogger

Files:

• CMS watcher design.txt (deleted)
• __main__.py (added)
• cad_watcher.py (modified) (3 diffs)
• cms_watcher.py (modified) (7 diffs)
• logger design.txt (deleted)
• logging_service.py (modified) (3 diffs)
• wing_project.wpr (added)

trunk/webapps/unifiedlogger/cad_watcher.py

@@ -3 +3 @@
 
 # CAD comment log Watcher
-# Look for changes in the CAD comment log
+# Look for changes in the CAD comment log.
+# The CADserver will append new comments to the log as they arrive 
+# from clients.  We only need to keep track of the log length in order to
+# determine if a new comment has been added.  We will output the 
+# new messages that arrived during the last wait interval. 
 # jdalbey  7/6/2019
 
@@ -14 +18 @@
     return not isEmpty(cmsitem)
 
-# Read the cms message file
+# Read the cad comments log 
 def readFile():
     lines = []
     try:
-        text_file = open("../../CADcomments.log", "r")
+        text_file = open("CADcomments.log", "r")
     except IOError:
         print "Error: missing CADcomments.log file."
@@ -39 +43 @@
     return currList
 
+# Local main for unit testing
 def main():
     setup()
-    # Loop Forever
+    # Loop Forever, checking every five seconds
     while True:
-        # Look for changed messages
+        # Look for new messages
         answer = getLogEntries()
         # Output results

trunk/webapps/unifiedlogger/cms_watcher.py

@@ -8 +8 @@
 prevList = []  # previous messages
 currList = []  # current messages
-locationMap = {}
+locationMap = {} # map of CMS ID's to locations
 
 # Utility functions
@@ -18 +18 @@
 # Read the cms message file
 def readFile():     
-     with open ("../dynamicdata/cms_messages.json",'r') as myfile:
+     with open ("webapps/dynamicdata/cms_messages.json",'r') as myfile:
           jsonData=myfile.read()
  
@@ -25 +25 @@
 # Read the static file of cms locations and create a lookup map
 def loadLocations():
-     with open ("../cptms/data_layers/cms_locations_D12.gjson",'r') as myfile:
+     with open ("webapps/cptms/data_layers/cms_locations_D12.gjson",'r') as myfile:
           jsonData=myfile.read()
  
@@ -40 +40 @@
      for idx in range(0,len(msgList)):
           idList.append(msgList[idx]['cms']['index'])
-          prevList.append(",,,,,")
+          prevList.append(":::::")
      return msgList
 
@@ -49 +49 @@
      for idx in range(0,len(msgList)):
           currList.append(
-                    msgList[idx]['cms']['message']['phase1']['Line1'] + ',' + 
-                    msgList[idx]['cms']['message']['phase1']['Line2'] + ',' +
-                    msgList[idx]['cms']['message']['phase1']['Line3'] + ',' +
-                    msgList[idx]['cms']['message']['phase2']['Line1'] + ',' +
-                    msgList[idx]['cms']['message']['phase2']['Line2'] + ',' +
+                    msgList[idx]['cms']['message']['phase1']['Line1'] + ':' + 
+                    msgList[idx]['cms']['message']['phase1']['Line2'] + ':' +
+                    msgList[idx]['cms']['message']['phase1']['Line3'] + ':' +
+                    msgList[idx]['cms']['message']['phase2']['Line1'] + ':' +
+                    msgList[idx]['cms']['message']['phase2']['Line2'] + ':' +
                     msgList[idx]['cms']['message']['phase2']['Line3'])
 
@@ -71 +71 @@
           # Is a new message activated?
           if isEmpty(prevList[idx]) and isFull(currList[idx]):
-               results.append("CMS Activated. " + locationMap[idList[idx]] + " '" + currList[idx] +"'")
+               results.append("CMS Activated.," + locationMap[idList[idx]] + ", '" + currList[idx] +"'")
           # Is an existing message turned off?
           if isEmpty(currList[idx]) and isFull(prevList[idx]):
-               results.append("CMS Deactivated. " + locationMap[idList[idx]])
+               results.append("CMS Deactivated., " + locationMap[idList[idx]])
           # Did a message change?
           if isFull(currList[idx]) and isFull(prevList[idx]) and currList[idx] != prevList[idx]:
-               results.append("CMS Updated. " + locationMap[idList[idx]] + " '" + currList[idx] +"'")
+               results.append("CMS Updated., " + locationMap[idList[idx]] + ", '" + currList[idx] +"'")
 
      # Save the current list as previous
@@ -83 +83 @@
      return results
 
+# Local main for unit testing
 def main():
      global currList

trunk/webapps/unifiedlogger/logging_service.py

@@ -1 @@
-import cms_watcher, cad_watcher, time, json
+import cms_watcher, cad_watcher, time, json, ConfigParser
 # Unified Logging Service
 # jdalbey 7/6/2019
 
+outputFilename = "unifiedlog.csv"
 
 # Load the sim time file and extract the seconds */
 def getSimTime():
-    with open ("../dynamicdata/sim_elapsedtime.json", 'r') as myfile:
+    with open ("webapps/dynamicdata/sim_elapsedtime.json", 'r') as myfile:
         jsonData=myfile.read()
          
@@ -15 +16 @@
     return  "%d:%02d:%02d" % (h, m, s)    
 
-def main():
+def startup():
+    # get path to output file from configuration
+    config = ConfigParser.ConfigParser()
+    config.read('config/logging_service.cfg')
+    logfilepath  = config.get('Paths', 'UnifiedLogPath')
+    
     # Delete any previously existing output file
-    f = open("../dynamicdata/unifiedlog.html", "w")
-    startHTML = "<HTML><HEAD><meta http-equiv=\"refresh\" content=\"5\" /></HEAD><BODY><PRE>"
-    f.write(startHTML);
+    f = open(logfilepath + outputFilename, "w")
     f.close()            
     # List of the available plugin modules 
@@ -51 +55 @@
                 trimmed_item = item.strip()
                 if len(trimmed_item) > 0:
-                    output += timeStamp + " " + trimmed_item + "\n"
+                    output += timeStamp + ", " + trimmed_item + "\n"
     #    END LOOP
     #    IF the Output Buffer has any contents THEN
         if len(output) > 0:
-    #       Write (append) Output Buffer to unified log file 
+    #       Write (append) Output Buffer to unified log file as CSV
+    #       Assumes fields don't contain commas 
             print output,
-            f = open("../dynamicdata/unifiedlog.html", "a")
+            f = open(logfilepath + outputFilename, "a")
             f.write(output)
             f.close()            
     #    END IF
-    #    Wait one second
-        time.sleep(1)
+    #    Wait five seconds
+        time.sleep(5)
 
 #END DO
-if __name__ == "__main__":
-    main()
+
+if __name__ == '__main__':
+    startup()