Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 478) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 479) @@ -198,107 +198,51 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('activitylog_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 42)], - 'code-line': ' desiredFields = "Activity Log.,"+name+","+cod'\ - 'e+","+msg\n', - 'first-line': 33L, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': 'ActivityLogPath = webapps/dynamicdata/\n', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1666L, - 'selection_end': 1728L, - 'selection_start': 1728L, + 'sel-line': 2L, + 'sel-line-start': 46L, + 'selection_end': 84L, + 'selection_start': 84L, 'zoom': 0L}, - 1564408367.809524], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': " msgList = text_file.read().split('\\n')"\ - "\n", - 'first-line': 38L, - 'folded-linenos': [], - 'sel-line': 52L, - 'sel-line-start': 1613L, - 'selection_end': 1613L, - 'selection_start': 1613L, - 'zoom': 0L}, - 1564408386.133798], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # Append simulation time and the log entri'\ - 'es to the Output Buffer\n', + 1566600666.088779], + [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': 589L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1566600669.118991], + [loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': 'ActivityLogPath = webapps/dynamicdata/\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 2L, + 'sel-line-start': 46L, + 'selection_end': 84L, + 'selection_start': 84L, + 'zoom': 0L}, + 1566600690.155041], + [loc('activitylog_watcher.py'), + {'attrib-starts': [], + 'code-line': '#from copy import deepcopy\n', 'first-line': 15L, 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1843L, - 'selection_end': 1851L, - 'selection_start': 1851L, - 'zoom': 0L}, - 1564408404.830956], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': ' print pathToLog + " missing: assuming re'\ - 'set."\n', - 'first-line': 35L, - 'folded-linenos': [], - 'sel-line': 37L, - 'sel-line-start': 1087L, - 'selection_end': 1143L, - 'selection_start': 1143L, - 'zoom': 0L}, - 1564436972.290038], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # Append simulation time and the log entri'\ - 'es to the Output Buffer\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1843L, - 'selection_end': 1851L, - 'selection_start': 1851L, - 'zoom': 0L}, - 1564436998.714792], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': ' print pathToLog + " missing: assuming re'\ - 'set."\n', - 'first-line': 20L, - 'folded-linenos': [], - 'sel-line': 37L, - 'sel-line-start': 1087L, - 'selection_end': 1143L, - 'selection_start': 1143L, - 'zoom': 0L}, - 1564437041.061947], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': '\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 24L, - 'sel-line-start': 789L, - 'selection_end': 789L, - 'selection_start': 789L, - 'zoom': 0L}, - 1564438151.528836], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': ' print pathToLog + " missing: assuming re'\ - 'set."\n', - 'first-line': 32L, - 'folded-linenos': [], - 'sel-line': 37L, - 'sel-line-start': 1087L, - 'selection_end': 1143L, - 'selection_start': 1143L, - 'zoom': 0L}, - 1564438185.449366], + 'sel-line': 1L, + 'sel-line-start': 32L, + 'selection_end': 33L, + 'selection_start': 33L, + 'zoom': 0L}, + 1566600696.93349], [loc('logging_service.py'), {'attrib-starts': [('getSimTime|0|', @@ -306,5 +250,5 @@ 'code-line': ' print "Proceeding with previous time: ", toHM'\ 'S(seconds)\n', - 'first-line': 0L, + 'first-line': 3L, 'folded-linenos': [], 'sel-line': 21L, @@ -313,155 +257,206 @@ 'selection_start': 649L, 'zoom': 0L}, - 1564440773.252122], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 42)], - 'code-line': ' desiredFields = "Activity Log.,"+name+","+co'\ - 'de+" "+msg\n', + 1566600699.578844], + [loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': 'ActivityLogPath = webapps/dynamicdata/\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1666L, - 'selection_end': 1723L, - 'selection_start': 1723L, - 'zoom': 0L}, - 1564453007.218601], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 24)], - 'code-line': ' print pathToLog + " missing: assuming re'\ - 'set."\n', + 'sel-line': 2L, + 'sel-line-start': 46L, + 'selection_end': 84L, + 'selection_start': 84L, + 'zoom': 0L}, + 1566600715.315246], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': " logfilepath = config.get('Paths', 'ActivityLogPa"\ + "th')\n", + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 25L, + 'sel-line-start': 767L, + 'selection_end': 767L, + 'selection_start': 767L, + 'zoom': 0L}, + 1566600747.038673], + [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': 589L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1566600751.835139], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': " logfilepath = config.get('Paths', 'ActivityLogPa"\ + "th')\n", + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 25L, + 'sel-line-start': 767L, + 'selection_end': 767L, + 'selection_start': 767L, + 'zoom': 0L}, + 1566600765.566783], + [loc('../../../config/logging_service.cfg'), + {'attrib-starts': [], + 'code-line': 'UnifiedLogPath = webapps/dynamicdata/\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 37L, - 'sel-line-start': 1087L, - 'selection_end': 1143L, - 'selection_start': 1143L, - 'zoom': 0L}, - 1564453014.195405], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1564453030.973979], - [loc('unknown:untitled-1.py'), + 'sel-line': 1L, + 'sel-line-start': 8L, + 'selection_end': 22L, + 'selection_start': 8L, + 'zoom': 0L}, + 1566600771.661802], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': " logfilepath = config.get('Paths', 'UnifiedLogPat"\ + "h')\n", + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 25L, + 'sel-line-start': 767L, + 'selection_end': 767L, + 'selection_start': 767L, + 'zoom': 0L}, + 1566600786.484821], + [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': 596L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1566600797.469543], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': " logfilepath = config.get('Paths', 'UnifiedLogPat"\ + "h')\n", + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 25L, + 'sel-line-start': 767L, + 'selection_end': 767L, + 'selection_start': 767L, + 'zoom': 0L}, + 1566600824.872938], + [loc('__main__.py'), {'attrib-starts': [], - 'code-line': '', + 'code-line': 'import logging_service, os, ConfigParser\n', 'first-line': 0L, 'folded-linenos': [], 'sel-line': 0L, 'sel-line-start': 0L, - 'selection_end': 0L, - 'selection_start': 0L, - 'zoom': 0L}, - 1564453042.242505], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', + 'selection_end': 40L, + 'selection_start': 28L, + 'zoom': 0L}, + 1566600828.88837], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': " logfilepath = config.get('Paths', 'ActivityLogPa"\ + "th')\n", + 'first-line': 15L, + 'folded-linenos': [], + 'sel-line': 25L, + 'sel-line-start': 767L, + 'selection_end': 814L, + 'selection_start': 814L, + 'zoom': 0L}, + 1566600871.549505], + [loc('__main__.py'), + {'attrib-starts': [], + 'code-line': 'import logging_service, os, ConfigParser\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1564453047.692926], - [loc('test_logging_service.py'), - {'attrib-starts': [('test_toHMS|0|', - 0)], - 'code-line': ' ', + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 40L, + 'selection_start': 28L, + 'zoom': 0L}, + 1566600879.173012], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ + 'og"\n', + 'first-line': 18L, + 'folded-linenos': [], + 'sel-line': 26L, + 'sel-line-start': 824L, + 'selection_end': 857L, + 'selection_start': 857L, + 'zoom': 0L}, + 1566600913.173925], + [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': 596L, + 'folded-linenos': [], + 'sel-line': 606L, + 'sel-line-start': 22028L, + 'selection_end': 22028L, + 'selection_start': 22028L, + 'zoom': 0L}, + 1566600921.8293], + [loc('activitylog_watcher.py'), + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': ' logfilename = "data.json" #"IncidentActivity.l'\ + 'og"\n', + 'first-line': 18L, + 'folded-linenos': [], + 'sel-line': 26L, + 'sel-line-start': 824L, + 'selection_end': 857L, + 'selection_start': 857L, + 'zoom': 0L}, + 1566600922.721255], + [loc('__main__.py'), + {'attrib-starts': [], + 'code-line': 'import logging_service, os, ConfigParser\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 3L, - 'sel-line-start': 57L, - 'selection_end': 61L, - 'selection_start': 61L, - 'zoom': 0L}, - 1564453169.869372], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1564453453.032643], - [loc('test_logging_service.py'), - {'attrib-starts': [('test_toHMS|0|', - 2)], - 'code-line': ' ', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 7L, - 'sel-line-start': 194L, - 'selection_end': 198L, - 'selection_start': 198L, - 'zoom': 0L}, - 1564453867.007001], - [loc('test_logging_service.py'), - {'attrib-starts': [('test_toHMS|0|', - 2)], - 'code-line': 'def test_toHMS():\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 2L, - 'sel-line-start': 35L, - 'selection_end': 49L, - 'selection_start': 39L, - 'zoom': 0L}, - 1564453872.826719], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 30L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1564453933.136133], - [loc('test_logging_service.py'), - {'attrib-starts': [('test_toHMS|0|', - 2)], - 'code-line': ' assert toHMS(3601) == "1:00:01"\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 6L, - 'sel-line-start': 158L, - 'selection_end': 192L, - 'selection_start': 192L, - 'zoom': 0L}, - 1564454686.591132]], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 40L, + 'selection_start': 28L, + 'zoom': 0L}, + 1566600934.334362]], 20), - 'current-loc': loc('cad_watcher.py'), + 'current-loc': loc('activitylog_watcher.py'), 'editor-state-list': [(loc('activitylog_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 42)], - 'code-line': ' desiredFields = "Activ'\ - 'ity Log.,"+name+","+code+" "+msg\n', - 'first-line': 0L, + {'attrib-starts': [('readFile|0|', + 21)], + 'code-line': ' logfilename = "data.json" '\ + ' #"IncidentActivity.log"\n', + 'first-line': 18L, 'folded-linenos': [], - 'sel-line': 55L, - 'sel-line-start': 1666L, - 'selection_end': 1723L, - 'selection_start': 1723L, + 'sel-line': 26L, + 'sel-line-start': 824L, + 'selection_end': 857L, + 'selection_start': 857L, 'zoom': 0L}), (loc('cad_watcher.py'), @@ -490,11 +485,12 @@ (loc('../../../config/logging_service.cfg'), {'attrib-starts': [], - 'code-line': '[Paths]\n', + 'code-line': 'UnifiedLogPath = webapps/dynam'\ + 'icdata/\n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 0L, - 'selection_start': 0L, + 'sel-line': 1L, + 'sel-line-start': 8L, + 'selection_end': 22L, + 'selection_start': 8L, 'zoom': 0L}), (loc('logging_service.py'), @@ -503,5 +499,5 @@ 'code-line': ' print "Proceeding with '\ 'previous time: ", toHMS(seconds)\n', - 'first-line': 30L, + 'first-line': 3L, 'folded-linenos': [], 'sel-line': 21L, @@ -509,16 +505,4 @@ 'selection_end': 649L, 'selection_start': 649L, - 'zoom': 0L}), - (loc('test_logging_service.py'), - {'attrib-starts': [('test_toHMS|0|', - 2)], - 'code-line': ' assert toHMS(3601) == "1:0'\ - '0:01"\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 6L, - 'sel-line-start': 158L, - 'selection_end': 192L, - 'selection_start': 192L, 'zoom': 0L}), (loc('__main__.py'), @@ -540,13 +524,11 @@ loc('../../../config/logging_service.cfg'), loc('logging_service.py'), - loc('test_logging_service.py'), loc('__main__.py')]), - 'open_files': [u'../../../config/logging_service.cfg', + 'open_files': [u'cms_watcher.py', + u'cad_watcher.py', + u'logging_service.py', + u'../../../config/logging_service.cfg', u'__main__.py', - u'cms_watcher.py', - u'activitylog_watcher.py', - u'logging_service.py', - u'test_logging_service.py', - u'cad_watcher.py']}, + u'activitylog_watcher.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, @@ -555,5 +537,5 @@ 'traversal_pos': ((0, 3), - 1564454637.847513), + 1566600913.140074), 'user_data': {}}, 'saved_notebook_display': None, @@ -563,5 +545,5 @@ 'traversal_pos': ((0, 4), - 1564454677.406196), + 1566600923.964362), 'user_data': {}}, 'window-alloc': (29, @@ -569,11 +551,10 @@ 1197, 722)}]} -guimgr.recent-documents = [loc('cad_watcher.py'), - loc('test_logging_service.py'), +guimgr.recent-documents = [loc('activitylog_watcher.py'), + loc('__main__.py'), + loc('../../../config/logging_service.cfg'), loc('logging_service.py'), - loc('activitylog_watcher.py'), - loc('__main__.py'), - loc('cms_watcher.py'), - loc('../../../config/logging_service.cfg')] + loc('cad_watcher.py'), + loc('cms_watcher.py')] guimgr.visual-state = {loc('get_app_properties.py'): {'attrib-starts': [], 'code-line': '', @@ -593,4 +574,15 @@ 'selection_end': 455L, 'selection_start': 455L, + 'zoom': 0L}, + loc('test_logging_service.py'): {'attrib-starts': [('t'\ + 'est_toHMS|0|', + 2)], + 'code-line': ' assert toHMS(3601) == "1:00:01"\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 6L, + 'sel-line-start': 158L, + 'selection_end': 192L, + 'selection_start': 192L, 'zoom': 0L}, loc('../../../../../../../usr/lib/python2.7/ConfigParser.py'): {'a'\ @@ -613,5 +605,5 @@ 589)], 'code-line': ' raise NoSectionError(section)\n', - 'first-line': 601L, + 'first-line': 596L, 'folded-linenos': [], 'sel-line': 606L, Index: trunk/src/python/unifiedlogger/activitylog_watcher.py =================================================================== --- trunk/src/python/unifiedlogger/activitylog_watcher.py (revision 478) +++ trunk/src/python/unifiedlogger/activitylog_watcher.py (revision 479) @@ -1,4 +1,4 @@ import json, time, ConfigParser -from copy import deepcopy +#from copy import deepcopy # Incident Activity log Watcher @@ -24,11 +24,12 @@ config = ConfigParser.ConfigParser() config.read('config/logging_service.cfg') - logfilepath = config.get('Paths', 'UnifiedLogPath') + logfilepath = config.get('Paths', 'ActivityLogPath') + logfilename = "data.json" #"IncidentActivity.log" + lines = [] - lines = [] try: - json_file = open (logfilepath + "IncidentActivity.log",'r') + json_file = open (logfilepath + logfilename,'r') except IOError: - print "Error: missing "+logfilepath+"IncidentActivity.log file." + print "Error: missing "+logfilepath+logfilename+" file." else: jsonData=json_file.read()