allow overriding of property filename, part 2

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/constrictor/trunk@588 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/constrictor.py b/constrictor.py
index 15cf9f1..c12b5c3 100755 (executable)
--- a/constrictor.py
+++ b/constrictor.py
@@ -53,11 +53,19 @@ def onThreadsComplete(scriptManager):
     droneController.sendResult(type='task_summary', **summary)
 
 
-def readArgv():
+def read_args_and_props():
+    global props
+
     # see if we have any command-line args that override the properties file
     ops, args = getopt.getopt(sys.argv[1:], 's:t:i:d:p:l:f:h')
     options = dict( (k,v) for k,v in ops )
 
+    if options.has_key('-f'):
+        props_filename = options['-f']
+
+    loadProps(props_filename)
+    props = Properties.getProperties()
+
     if options.has_key('-h'):
         usage()
     if options.has_key('-s'):
@@ -72,8 +80,6 @@ def readArgv():
         props.setProperty('constrictor.port', options['-p'])
     if options.has_key('-l'):
         props.setProperty('constrictor.listenAddress', options['-l'])
-    if options.has_key('-f'):
-        props_filename = options['-f']
 
 
 
@@ -82,9 +88,7 @@ def onThreadsComplete(scriptManager):
     summary = ScriptThread.currentScriptThread().dbConnection.createTaskSummary()
     droneController.sendResult(type='task_summary', **summary)
 
-loadProps(props_filename)
-props = Properties.getProperties()
-readArgv()
+read_args_and_props()
 initDirs()
 initLog()
 scriptDirs = props.getProperty('constrictor.scriptDirs').split(',')