Index: trunk/src/python/unifiedlogger/cad_watcher.py =================================================================== --- trunk/src/python/unifiedlogger/cad_watcher.py (revision 439) +++ trunk/src/python/unifiedlogger/cad_watcher.py (revision 454) @@ -1,3 +1,3 @@ -import json, time +import json, time, ConfigParser from copy import deepcopy @@ -20,9 +20,14 @@ # Read the cad comments log def readFile(): + # get path to input file from configuration + config = ConfigParser.ConfigParser() + config.read('config/logging_service.cfg') + logfilepath = config.get('Paths', 'UnifiedLogPath') + lines = [] try: - text_file = open("CADcomments.log", "r") + text_file = open(logfilepath + "CADcomments.log", "r") except IOError: - print "Error: missing CADcomments.log file." + print "Error: missing "+logfilepath+"CADcomments.log file." else: lines = text_file.read().split('\n') Index: trunk/src/python/unifiedlogger/logging_service.py =================================================================== --- trunk/src/python/unifiedlogger/logging_service.py (revision 439) +++ trunk/src/python/unifiedlogger/logging_service.py (revision 454) @@ -9,6 +9,9 @@ with open ("webapps/dynamicdata/sim_elapsedtime.json", 'r') as myfile: jsonData=myfile.read() - - seconds = json.loads(jsonData)['elapsedtime'] + seconds = 0 + try: + seconds = json.loads(jsonData)['elapsedtime'] + except: + print "Error loading json for elapsed time" # convert seconds to H:MM:SS m, s = divmod(int(seconds), 60) Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 452) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 454) @@ -183,203 +183,16 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' print "revision ",get_app_properties.getRevision('\ - ')\n', - 'first-line': 0L, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 17)], + 'code-line': 'def startup():\n', + 'first-line': 12L, 'folded-linenos': [], - 'sel-line': 4L, - 'sel-line-start': 215L, - 'selection_end': 269L, - 'selection_start': 269L, + 'sel-line': 17L, + 'sel-line-start': 513L, + 'selection_end': 527L, + 'selection_start': 527L, 'zoom': 0L}, - 1563131297.40217], - [loc('logging_service.py'), - {'attrib-starts': [], - 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ - 'arser\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 57L, - 'selection_start': 57L, - 'zoom': 0L}, - 1563131307.615114], - [loc('get_app_properties.py'), - {'attrib-starts': [('getRevision|0|', - 14)], - 'code-line': 'def getRevision(lines):\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 14L, - 'sel-line-start': 382L, - 'selection_end': 382L, - 'selection_start': 382L, - 'zoom': 0L}, - 1563131330.855952], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' print "revision ",get_app_properties.getRevision'\ - '()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 4L, - 'sel-line-start': 215L, - 'selection_end': 215L, - 'selection_start': 215L, - 'zoom': 0L}, - 1563131341.340806], - [loc('get_app_properties.py'), - {'attrib-starts': [('getRevision|0|', - 14)], - 'code-line': ' lines = getProperties()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 15L, - 'sel-line-start': 401L, - 'selection_end': 413L, - 'selection_start': 413L, - 'zoom': 0L}, - 1563131376.535666], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' print "Unified Logging Service v"+revNum,"starti'\ - 'ng from ",os.getcwd()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 4L, - 'sel-line-start': 198L, - 'selection_end': 244L, - 'selection_start': 244L, - 'zoom': 0L}, - 1563131462.025839], - [loc('get_app_properties.py'), - {'attrib-starts': [], - 'code-line': '\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 0L, - 'selection_start': 0L, - 'zoom': 0L}, - 1563131503.437265], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' print "Unified Logging Service v"+revNum,"starti'\ - 'ng from ",os.getcwd()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 4L, - 'sel-line-start': 198L, - 'selection_end': 244L, - 'selection_start': 244L, - 'zoom': 0L}, - 1563231920.207662], - [loc('get_app_properties.py'), - {'attrib-starts': [('getProperties|0|', - 3)], - 'code-line': ' print "Error: missing src/tmcsim/application'\ - '.properties file."\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 8L, - 'sel-line-start': 173L, - 'selection_end': 213L, - 'selection_start': 213L, - 'zoom': 0L}, - 1563232029.32642], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': ' # get path to output file from configuration\n', - 'first-line': 9L, - 'folded-linenos': [], - 'sel-line': 18L, - 'sel-line-start': 528L, - 'selection_end': 721L, - 'selection_start': 528L, - 'zoom': 0L}, - 1563232797.935308], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' \n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 7L, - 'sel-line-start': 340L, - 'selection_end': 344L, - 'selection_start': 344L, - 'zoom': 0L}, - 1563232895.220896], - [loc('get_app_properties.py'), - {'attrib-starts': [], - 'code-line': '# Obsolete - moved to config file instead.\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 42L, - 'selection_start': 42L, - 'zoom': 0L}, - 1563232919.766056], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': " config.read('config/application_properties.cf')"\ - "\n", - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 5L, - 'sel-line-start': 232L, - 'selection_end': 281L, - 'selection_start': 281L, - 'zoom': 0L}, - 1563294795.82432], - [loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'), - {'attrib-starts': [('ConfigParser|0|', - 85), - ('ConfigParser|0|.get|0|', - 589)], - 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 601L, - 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, - 'zoom': 0L}, - 1563294818.055248], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' except: # If config file not found, use a quest'\ - 'ion mark placeholder \n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 8L, - 'sel-line-start': 356L, - 'selection_end': 417L, - 'selection_start': 417L, - 'zoom': 0L}, - 1563294949.099012], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': 'def startup():\n', - 'first-line': 12L, - 'folded-linenos': [], - 'sel-line': 17L, - 'sel-line-start': 513L, - 'selection_end': 527L, - 'selection_start': 527L, - 'zoom': 0L}, - 1563295110.747974], + 1563295110.747974], [loc('get_app_properties.py'), {'attrib-starts': [], @@ -430,16 +243,201 @@ 'selection_start': 527L, 'zoom': 0L}, - 1563295126.806403]], + 1563295126.806403], + [loc('__main__.py'), + {'attrib-starts': [('main|0|', + 2)], + 'code-line': ' except: # If config file not found, use a quest'\ + 'ion mark placeholder \n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 8L, + 'sel-line-start': 356L, + 'selection_end': 417L, + 'selection_start': 417L, + 'zoom': 0L}, + 1563298825.820571], + [loc('cad_watcher.py'), + {'attrib-starts': [('readFile|0|', + 20)], + 'code-line': 'def readFile():\n', + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 20L, + 'sel-line-start': 575L, + 'selection_end': 590L, + 'selection_start': 590L, + 'zoom': 0L}, + 1563298863.068667], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 17)], + 'code-line': 'def startup():\n', + 'first-line': 12L, + 'folded-linenos': [], + 'sel-line': 17L, + 'sel-line-start': 513L, + 'selection_end': 527L, + 'selection_start': 527L, + 'zoom': 0L}, + 1563298890.003056], + [loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': '[Paths]\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1563298905.850272], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 17)], + 'code-line': ' # get path to output file from configuration\n', + 'first-line': 12L, + 'folded-linenos': [], + 'sel-line': 18L, + 'sel-line-start': 528L, + 'selection_end': 720L, + 'selection_start': 528L, + 'zoom': 0L}, + 1563298925.9103], + [loc('cad_watcher.py'), + {'attrib-starts': [('readFile|0|', + 20)], + 'code-line': ' text_file = open(logfilepath + "CADcomments.'\ + 'log", "r")\n', + 'first-line': 12L, + 'folded-linenos': [], + 'sel-line': 28L, + 'sel-line-start': 813L, + 'selection_end': 852L, + 'selection_start': 852L, + 'zoom': 0L}, + 1563298944.867817], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 17)], + 'code-line': ' # get path to output file from configuration\n', + 'first-line': 12L, + 'folded-linenos': [], + 'sel-line': 18L, + 'sel-line-start': 528L, + 'selection_end': 720L, + 'selection_start': 528L, + 'zoom': 0L}, + 1563298961.49365], + [loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': '[Paths]\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1563298965.173624], + [loc('cad_watcher.py'), + {'attrib-starts': [('readFile|0|', + 20)], + 'code-line': ' config = ConfigParser.ConfigParser()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 22L, + 'sel-line-start': 640L, + 'selection_end': 640L, + 'selection_start': 640L, + 'zoom': 0L}, + 1563299005.834573], + [loc('__main__.py'), + {'attrib-starts': [], + 'code-line': 'import logging_service, os, ConfigParser\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 40L, + 'selection_start': 28L, + 'zoom': 0L}, + 1563299012.548244], + [loc('cad_watcher.py'), + {'attrib-starts': [('readFile|0|', + 20)], + 'code-line': ' # get path to input file from configuration\n', + 'first-line': 18L, + 'folded-linenos': [], + 'sel-line': 21L, + 'sel-line-start': 605L, + 'selection_end': 628L, + 'selection_start': 628L, + 'zoom': 0L}, + 1563311309.128491], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 7)], + 'code-line': ' h, m = divmod(m, 60)\n', + 'first-line': 3L, + 'folded-linenos': [], + 'sel-line': 14L, + 'sel-line-start': 444L, + 'selection_end': 468L, + 'selection_start': 468L, + 'zoom': 0L}, + 1563311363.078389], + [loc('../../../../../../../../usr/lib/python2.7/json/decoder.py'), + {'attrib-starts': [('JSONDecoder|0|', + 271), + ('JSONDecoder|0|.raw_decode|0|', + 369)], + 'code-line': ' obj, end = self.scan_once(s, idx)\n', + 'first-line': 370L, + 'folded-linenos': [], + 'sel-line': 379L, + 'sel-line-start': 13534L, + 'selection_end': 13534L, + 'selection_start': 13534L, + 'zoom': 0L}, + 1563311407.328163], + [loc('logging_service.py'), + {'attrib-starts': [('getSimTime|0|', + 7)], + 'code-line': ' h, m = divmod(m, 60)\n', + 'first-line': 6L, + 'folded-linenos': [], + 'sel-line': 14L, + 'sel-line-start': 444L, + 'selection_end': 468L, + 'selection_start': 468L, + 'zoom': 0L}, + 1563311428.009251], + [loc('../../../../../../../../usr/lib/python2.7/json/decoder.py'), + {'attrib-starts': [('JSONDecoder|0|', + 271), + ('JSONDecoder|0|.raw_decode|0|', + 369)], + 'code-line': ' obj, end = self.scan_once(s, idx)\n', + 'first-line': 370L, + 'folded-linenos': [], + 'sel-line': 379L, + 'sel-line-start': 13534L, + 'selection_end': 13534L, + 'selection_start': 13534L, + 'zoom': 0L}, + 1563311437.82119]], 20), - 'current-loc': loc('__main__.py'), + 'current-loc': loc('logging_service.py'), 'editor-state-list': [(loc('cad_watcher.py'), - {'attrib-starts': [], - 'code-line': '# Read the cad comments log \n', - 'first-line': 15L, + {'attrib-starts': [('readFile|0|', + 20)], + 'code-line': ' # get path to input file f'\ + 'rom configuration\n', + 'first-line': 18L, 'folded-linenos': [], - 'sel-line': 19L, - 'sel-line-start': 546L, - 'selection_end': 838L, - 'selection_start': 546L, + 'sel-line': 21L, + 'sel-line-start': 605L, + 'selection_end': 628L, + 'selection_start': 628L, 'zoom': 0L}), (loc('cms_watcher.py'), @@ -455,26 +453,50 @@ 'selection_start': 353L, 'zoom': 0L}), + (loc('../../../../../../../../usr/lib/python2.7/json/decoder.py'), + {'attrib-starts': [('JSONDecoder|0|', + 271), + ('JSONDecoder|0|.raw_decode|0|', + 369)], + 'code-line': ' obj, end = self.sc'\ + 'an_once(s, idx)\n', + 'first-line': 370L, + 'folded-linenos': [], + 'sel-line': 379L, + 'sel-line-start': 13534L, + 'selection_end': 13534L, + 'selection_start': 13534L, + 'zoom': 0L}), + (loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': '[Paths]\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}), (loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': 'def startup():\n', - 'first-line': 12L, + {'attrib-starts': [('getSimTime|0|', + 7)], + 'code-line': ' print "Error loading js'\ + 'on for elapsed time"\n', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 17L, - 'sel-line-start': 513L, - 'selection_end': 527L, - 'selection_start': 527L, + 'sel-line': 14L, + 'sel-line-start': 410L, + 'selection_end': 460L, + 'selection_start': 460L, 'zoom': 0L}), (loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' except: # If config file '\ - 'not found, use a question mark placeholder \n', + {'attrib-starts': [], + 'code-line': 'import logging_service, os, Co'\ + 'nfigParser\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 8L, - 'sel-line-start': 356L, - 'selection_end': 417L, - 'selection_start': 417L, + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 40L, + 'selection_start': 28L, 'zoom': 0L})], 'has-focus': True, @@ -482,10 +504,13 @@ [loc('cad_watcher.py'), loc('cms_watcher.py'), + loc('../../../../../../../../usr/lib/python2.7/json/decoder.py'), + loc('../../../config/logging_service.cfg'), loc('logging_service.py'), loc('__main__.py')]), - 'open_files': [u'cad_watcher.py', + 'open_files': [u'../../../config/logging_service.cfg', + u'__main__.py', u'cms_watcher.py', - u'logging_service.py', - u'__main__.py']}, + u'cad_watcher.py', + u'logging_service.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, @@ -494,5 +519,5 @@ 'traversal_pos': ((0, 3), - 1563294795.772892), + 1563311427.998152), 'user_data': {}}, 'saved_notebook_display': None, @@ -502,5 +527,5 @@ 'traversal_pos': ((0, 4), - 1563295152.502479), + 1563311544.529663), 'user_data': {}}, 'window-alloc': (29, @@ -508,7 +533,9 @@ 1197, 722)}]} -guimgr.recent-documents = [loc('__main__.py'), - loc('logging_service.py'), +guimgr.recent-documents = [loc('logging_service.py'), + loc('../../../../../../../../usr/lib/python2.7/json/decoder.py'), loc('cad_watcher.py'), + loc('__main__.py'), + loc('../../../config/logging_service.cfg'), loc('cms_watcher.py')] guimgr.visual-state = {loc('get_app_properties.py'): {'attrib-starts': [],