allow overriding of property filename

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

diff --git a/constrictor.py b/constrictor.py
index 54b6277..15cf9f1 100755 (executable)
--- a/constrictor.py
+++ b/constrictor.py
@@ -23,6 +23,7 @@ from constrictor.log import *
 from constrictor.utils import loadProps, saveProps, initDirs, initDB, openScript, PROPS_FILENAME
 
 props = None
+props_filename = PROPS_FILENAME
 droneController = None
 
 def usage():
@@ -54,7 +55,7 @@ def onThreadsComplete(scriptManager):
 
 def readArgv():
     # 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:h')
+    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('-h'):
@@ -71,6 +72,8 @@ 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']
 
 
 
@@ -79,7 +82,7 @@ def onThreadsComplete(scriptManager):
     summary = ScriptThread.currentScriptThread().dbConnection.createTaskSummary()
     droneController.sendResult(type='task_summary', **summary)
 
-loadProps(PROPS_FILENAME)
+loadProps(props_filename)
 props = Properties.getProperties()
 readArgv()
 initDirs()