Index: trunk/src/python/unifiedlogger/__main__.py =================================================================== --- trunk/src/python/unifiedlogger/__main__.py (revision 446) +++ trunk/src/python/unifiedlogger/__main__.py (revision 452) @@ -4,7 +4,9 @@ # get revision number from configuration config = ConfigParser.ConfigParser() - config.read('config/application_properties.cfg') - revNum = config.get('Versions', 'revision_number') - + try: + config.read('config/application_properties.cf') + revNum = config.get('Versions', 'revision_number') + except: # If config file not found, use a question mark placeholder + revNum = "?" print "Unified Logging Service v"+revNum,"starting from ",os.getcwd() logging_service.startup() Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 446) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 452) @@ -183,110 +183,17 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('get_revision'), - {'attrib-starts': [], - 'code-line': 'print readFile()', + '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, 'folded-linenos': [], - 'sel-line': 15L, - 'sel-line-start': 412L, - 'selection_end': 418L, - 'selection_start': 418L, + 'sel-line': 4L, + 'sel-line-start': 215L, + 'selection_end': 269L, + 'selection_start': 269L, 'zoom': 0L}, - 1563130972.859102], - [loc('logging_service.py'), - {'attrib-starts': [], - 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ - 'arser, get_revision\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 71L, - 'selection_start': 71L, - 'zoom': 0L}, - 1563131014.214975], - [loc('get_revision'), - {'attrib-starts': [], - 'code-line': '', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 15L, - 'sel-line-start': 415L, - 'selection_end': 415L, - 'selection_start': 415L, - 'zoom': 0L}, - 1563131037.968315], - [loc('logging_service.py'), - {'attrib-starts': [], - 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ - 'arser, get_revision\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 71L, - 'selection_start': 71L, - 'zoom': 0L}, - 1563131045.946787], - [loc('get_revision'), - {'attrib-starts': [], - 'code-line': '', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 18L, - 'sel-line-start': 455L, - 'selection_end': 455L, - 'selection_start': 455L, - 'zoom': 0L}, - 1563131163.18444], - [loc('logging_service.py'), - {'attrib-starts': [], - 'code-line': 'import cms_watcher, cad_watcher, time, json, ConfigP'\ - 'arser, get_revision\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 71L, - 'selection_start': 71L, - 'zoom': 0L}, - 1563131223.451037], - [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': 370L, - 'selection_end': 385L, - 'selection_start': 374L, - 'zoom': 0L}, - 1563131232.527418], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': 'def startup():\n', - 'first-line': 7L, - 'folded-linenos': [], - 'sel-line': 17L, - 'sel-line-start': 533L, - 'selection_end': 547L, - 'selection_start': 547L, - 'zoom': 0L}, - 1563131266.147045], - [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': 269L, - 'selection_start': 269L, - 'zoom': 0L}, - 1563131297.40217], + 1563131297.40217], [loc('logging_service.py'), {'attrib-starts': [], @@ -422,5 +329,106 @@ 'selection_start': 42L, 'zoom': 0L}, - 1563232919.766056]], + 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], + [loc('get_app_properties.py'), + {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + 1563295114.739899], + [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}, + 1563295120.252652], + [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}, + 1563295122.349933], + [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}, + 1563295126.806403]], 20), 'current-loc': loc('__main__.py'), @@ -447,37 +455,26 @@ 'selection_start': 353L, 'zoom': 0L}), - (loc('get_app_properties.py'), - {'attrib-starts': [], - 'code-line': '# Obsolete - moved to config f'\ - 'ile instead.\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 42L, - 'selection_start': 42L, - 'zoom': 0L}), (loc('logging_service.py'), {'attrib-starts': [('startup|0|', 17)], - 'code-line': ' # get path to output file '\ - 'from configuration\n', - 'first-line': 9L, + 'code-line': 'def startup():\n', + 'first-line': 12L, 'folded-linenos': [], - 'sel-line': 18L, - 'sel-line-start': 528L, - 'selection_end': 721L, - 'selection_start': 528L, + 'sel-line': 17L, + 'sel-line-start': 513L, + 'selection_end': 527L, + 'selection_start': 527L, 'zoom': 0L}), (loc('__main__.py'), {'attrib-starts': [('main|0|', 2)], - 'code-line': ' \n', + 'code-line': ' except: # If config file '\ + 'not found, use a question mark placeholder \n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 7L, - 'sel-line-start': 340L, - 'selection_end': 344L, - 'selection_start': 344L, + 'sel-line': 8L, + 'sel-line-start': 356L, + 'selection_end': 417L, + 'selection_start': 417L, 'zoom': 0L})], 'has-focus': True, @@ -485,5 +482,4 @@ [loc('cad_watcher.py'), loc('cms_watcher.py'), - loc('get_app_properties.py'), loc('logging_service.py'), loc('__main__.py')]), @@ -491,5 +487,4 @@ u'cms_watcher.py', u'logging_service.py', - u'get_app_properties.py', u'__main__.py']}, 'saved_notebook_display': None, @@ -499,5 +494,5 @@ 'traversal_pos': ((0, 3), - 1563232857.216172), + 1563294795.772892), 'user_data': {}}, 'saved_notebook_display': None, @@ -507,5 +502,5 @@ 'traversal_pos': ((0, 4), - 1563232923.341114), + 1563295152.502479), 'user_data': {}}, 'window-alloc': (29, @@ -514,9 +509,17 @@ 722)}]} guimgr.recent-documents = [loc('__main__.py'), - loc('get_app_properties.py'), loc('logging_service.py'), loc('cad_watcher.py'), loc('cms_watcher.py')] -guimgr.visual-state = {loc('get_revision'): {'attrib-starts': [], +guimgr.visual-state = {loc('get_app_properties.py'): {'attrib-starts': [], + 'code-line': '', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 0L, + 'sel-line-start': 0L, + 'selection_end': 0L, + 'selection_start': 0L, + 'zoom': 0L}, + loc('get_revision'): {'attrib-starts': [], 'code-line': '', 'first-line': 0L, @@ -539,4 +542,17 @@ 'selection_end': 22028L, 'selection_start': 22028L, + 'zoom': 0L}, + loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'): {'a'\ + 'ttrib-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}} proj.build-cmd = {None: ('default',