Index: trunk/webapps/unifiedlogger/logging_service.py
===================================================================
--- trunk/webapps/unifiedlogger/logging_service.py (revision 431)
+++ trunk/webapps/unifiedlogger/logging_service.py (revision 433)
@@ -1,3 +1,3 @@
-import cms_watcher, time, json
+import cms_watcher, cad_watcher, time, json
# Unified Logging Service
# jdalbey 7/6/2019
@@ -16,10 +16,15 @@
def main():
+ # Delete any previously existing output file
+ f = open("../dynamicdata/unifiedlog.html", "w")
+ startHTML = ""
+ f.write(startHTML);
+ f.close()
# List of the available plugin modules
- plugins = ["cms_watcher"]
+ plugins = ["cms_watcher","cad_watcher"]
#FOR each plugin LOOP
for plugin in plugins:
# dynamically load the setup function for this plugin
- plugmodule = locals()[plugin]
+ plugmodule = globals()[plugin]
setupfunc = getattr(plugmodule, 'setup')
#Call setup
@@ -33,20 +38,26 @@
# Reset Output Buffer
output = ""
+ results = []
# FOR each plugin LOOP
for plugin in plugins:
# dynamically load the setup function for this plugin
- plugmodule = locals()[plugin]
- comparefunc = getattr(plugmodule, 'compare')
+ plugmodule = globals()[plugin]
+ getfunc = getattr(plugmodule, 'getLogEntries')
# Run the plugin process returning new log entries
- results = comparefunc() # Look for changed messages
+ results = getfunc()
+ # Append simulation time and the log entries to the Output Buffer
+ for item in results:
+ trimmed_item = item.strip()
+ if len(trimmed_item) > 0:
+ output += timeStamp + " " + trimmed_item + "\n"
# END LOOP
- # Append simulation time and the log entries to the Output Buffer
- for item in results:
- output += timeStamp + " " + item + "\n"
# IF the Output Buffer has any contents THEN
if len(output) > 0:
# Write (append) Output Buffer to unified log file
- print output
+ print output,
+ f = open("../dynamicdata/unifiedlog.html", "a")
+ f.write(output)
+ f.close()
# END IF
# Wait one second