Index: trunk/src/tmcsim/application.properties =================================================================== --- trunk/src/tmcsim/application.properties (revision 445) +++ trunk/src/tmcsim/application.properties (revision 446) @@ -1,5 +1,5 @@ -#Sun, 14 Jul 2019 16:45:46 -0700 +#Mon, 15 Jul 2019 16:19:28 -0700 -Application.revision=444 +Application.revision=445 -Application.buildnumber=154 +Application.buildnumber=159 Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 445) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 446) @@ -183,76 +183,15 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('cad_watcher.py'), - {'attrib-starts': [('setup|0|', - 31)], - 'code-line': ' return\n', - 'first-line': 15L, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('get_revision'), + {'attrib-starts': [], + 'code-line': 'print readFile()', + 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 33L, - 'sel-line-start': 888L, - 'selection_end': 898L, - 'selection_start': 898L, + 'sel-line': 15L, + 'sel-line-start': 412L, + 'selection_end': 418L, + 'selection_start': 418L, 'zoom': 0L}, - 1562953860.143117], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 17)], - 'code-line': ' f = open(logfilepath + outputFilename, "'\ - 'a")\n', - 'first-line': 6L, - 'folded-linenos': [], - 'sel-line': 63L, - 'sel-line-start': 2214L, - 'selection_end': 2263L, - 'selection_start': 2263L, - 'zoom': 0L}, - 1563130761.348523], - [loc('cad_watcher.py'), - {'attrib-starts': [], - 'code-line': '# Read the cad comments log \n', - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 19L, - 'sel-line-start': 546L, - 'selection_end': 838L, - 'selection_start': 546L, - 'zoom': 0L}, - 1563130779.821267], - [loc('unknown:untitled-1.py'), - {'attrib-starts': [('readFile|0|', - 3)], - 'code-line': '', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 15L, - 'sel-line-start': 412L, - 'selection_end': 412L, - 'selection_start': 412L, - 'zoom': 0L}, - 1563130943.219386], - [loc('__main__.py'), - {'attrib-starts': [('main|0|', - 2)], - 'code-line': ' print "Unified Logging Service starting from ",o'\ - 's.getcwd()\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 3L, - 'sel-line-start': 132L, - 'selection_end': 183L, - 'selection_start': 183L, - 'zoom': 0L}, - 1563130944.74234], - [loc('get_revision'), - {'attrib-starts': [], - 'code-line': 'print readFile()', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 15L, - 'sel-line-start': 412L, - 'selection_end': 418L, - 'selection_start': 418L, - 'zoom': 0L}, - 1563130972.859102], + 1563130972.859102], [loc('logging_service.py'), {'attrib-starts': [], @@ -422,5 +361,66 @@ 'selection_start': 0L, 'zoom': 0L}, - 1563131503.437265]], + 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]], 20), 'current-loc': loc('__main__.py'), @@ -449,34 +449,35 @@ (loc('get_app_properties.py'), {'attrib-starts': [], - 'code-line': '\n', + 'code-line': '# Obsolete - moved to config f'\ + 'ile instead.\n', 'first-line': 0L, 'folded-linenos': [], 'sel-line': 0L, 'sel-line-start': 0L, - 'selection_end': 0L, - 'selection_start': 0L, + 'selection_end': 42L, + 'selection_start': 42L, 'zoom': 0L}), (loc('logging_service.py'), - {'attrib-starts': [], - 'code-line': 'import cms_watcher, cad_watche'\ - 'r, time, json, ConfigParser\n', - 'first-line': 0L, + {'attrib-starts': [('startup|0|', + 17)], + 'code-line': ' # get path to output file '\ + 'from configuration\n', + 'first-line': 9L, 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 57L, - 'selection_start': 57L, + 'sel-line': 18L, + 'sel-line-start': 528L, + 'selection_end': 721L, + 'selection_start': 528L, 'zoom': 0L}), (loc('__main__.py'), {'attrib-starts': [('main|0|', 2)], - 'code-line': ' print "Unified Logging Ser'\ - 'vice v"+revNum,"starting from ",os.getcwd()\n', + 'code-line': ' \n', 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 4L, - 'sel-line-start': 198L, - 'selection_end': 244L, - 'selection_start': 244L, + 'sel-line': 7L, + 'sel-line-start': 340L, + 'selection_end': 344L, + 'selection_start': 344L, 'zoom': 0L})], 'has-focus': True, @@ -487,6 +488,6 @@ loc('logging_service.py'), loc('__main__.py')]), - 'open_files': [u'cms_watcher.py', - u'cad_watcher.py', + 'open_files': [u'cad_watcher.py', + u'cms_watcher.py', u'logging_service.py', u'get_app_properties.py', @@ -498,5 +499,5 @@ 'traversal_pos': ((0, 3), - 1563131330.846264), + 1563232857.216172), 'user_data': {}}, 'saved_notebook_display': None, @@ -506,5 +507,5 @@ 'traversal_pos': ((0, 4), - 1563131506.336019), + 1563232923.341114), 'user_data': {}}, 'window-alloc': (29, Index: trunk/src/python/unifiedlogger/__main__.py =================================================================== --- trunk/src/python/unifiedlogger/__main__.py (revision 444) +++ trunk/src/python/unifiedlogger/__main__.py (revision 446) @@ -1,6 +1,10 @@ -import logging_service, os, get_app_properties +import logging_service, os, ConfigParser # This main module is provided so the application can be conveniently bundled for deployment def main(): - revNum = get_app_properties.getRevision() + # get revision number from configuration + config = ConfigParser.ConfigParser() + config.read('config/application_properties.cfg') + revNum = config.get('Versions', 'revision_number') + print "Unified Logging Service v"+revNum,"starting from ",os.getcwd() logging_service.startup() Index: trunk/src/python/unifiedlogger/get_app_properties.py =================================================================== --- trunk/src/python/unifiedlogger/get_app_properties.py (revision 444) +++ (revision ) @@ -1,20 +1,0 @@ - - -# Read the application properties file -def getProperties(): - lines = [] - try: - text_file = open("src/tmcsim/application.properties", "r") - except IOError: - print "Error: missing src/timc/application.properties file." - else: - lines = text_file.read().split('\n') - text_file.close() - return lines - -# Accessor to SVN version number -def getRevision(): - lines = getProperties() - revNumber = lines[2].split("=")[1] - return revNumber -