minor updates

comms/alert_bot.py

@@ -61,6 +61,7 @@ class AlertMsgBot(sleekxmpp.ClientXMPP):
         logging.info('Connect to redis on server->%s:%s db->%s  qname->%s:%s' % (host, port, db, qprefix, qname))
         jid = config.get("alert_bot", "msg_bot.jid").strip('"').strip("'")
         password = config.get("alert_bot", "msg_bot.pass").strip('"').strip("'")
+
         sleekxmpp.ClientXMPP.__init__(self, jid, password)
         
         self.recipients = eval(config.get("alert_bot", "msg_bot.recipients").strip('"').strip("'"))
@@ -100,12 +101,12 @@ class AlertMsgBot(sleekxmpp.ClientXMPP):
     def process_alerts(self):
         self.quit = False
         while self.quit <> True:
-
             if not self.rsq.empty():
                 msg = self.rsq.get()
                 logging.debug('process_alerts: received msg: {%s}' % msg)
                 self.send_msg(msg)
             sleep(1)
+
         # Using wait=True ensures that the send queue will be
         # emptied before ending the session.
         self.disconnect(wait=True)
@@ -119,6 +120,7 @@ class AlertMsgBot(sleekxmpp.ClientXMPP):
         finally:
             self.tlock.release()  
         
+        
 #
 # alert helper doesn't care whether the xmpp server 
 # has started or not, all it cares is being able to put the message 

config/app.cfg

@@ -81,7 +81,7 @@ ib_mds.logconfig: "{'filename': '/home/larry-13.04/workspace/finopt/log/ib_mds.l
 #ib_mds.ib_port: 7496
 ib_mds.ib_port: 4001
 ib_mds.appid.id: 9800
-ib_mds.gateway: '192.168.1.118'
+ib_mds.gateway: 'localhost'
 ib_mds.is_persist: 1
 ib_mds.persist_dir: '/home/larry-13.04/workspace/finopt/data/mds_files'
 ib_mds.spill_over_limit: 10000
@@ -90,6 +90,6 @@ ib_mds.spill_over_limit: 10000
 ib_heartbeat.logconfig: "{'filename': '/home/larry-13.04/workspace/finopt/log/ib_mds.log', 'filemode': 'w','level': logging.INFO}"
 ib_heartbeat.ib_port: 4001
 ib_heartbeat.appid.id: 9911
-ib_heartbeat.gateway: '192.168.1.118'
+ib_heartbeat.gateway: 'localhost'
 ib_heartbeat.try_interval: 3
 ib_heartbeat.suppress_msg_interval: 60

sh/alert.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-ROOT=/home/larry-13.04/workspace/finopt
-export PYTHONPATH=$ROOT/src
-python $ROOT/src/comms/alert_bot.py $ROOT/src/config/app.cfg
+ROOT=$FINOPT_HOME
+export PYTHONPATH=$FINOPT_HOME:$PYTHONPATH
+python $FINOPT_HOME/comms/alert_bot.py $FINOPT_HOME/config/app.cfg
 

sh/alert.sh~

@@ -1,3 +1,5 @@
-export PYTHONPATH=/home/larry-13.04/workspace/finopt:$PYTHONPATH
-python ./alert_bot.py ../config/app.cfg
+#!/bin/bash
+ROOT=$FINOPT_HOME
+export PYTHONPATH=$FINOPT_HOME/src:$PYTHONPATH
+python $FINOPT_HOMEs/src/comms/alert_bot.py $FINOPT_HOME/config/app.cfg
 

sh/readme.1st

@@ -0,0 +1,10 @@
+1. set up the environment variable
+	- open ~/.bashrc
+	- export FINOPT_HOME=/home/<user>/worker/finopt
+	- close the terminal and open again, check the
+	  environment variable is set correctly
+
+
+2. open each sh file, amend the path settings accordingly
+
+	

sh/run_mds.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
-ROOT=/home/larry-13.04/workspace/finopt
-export PYTHONPATH=$ROOT/src
-python $ROOT/src/cep/ib_mds.py $ROOT/src/config/app.cfg
+ROOT=$FINOPT_HOME
+export PYTHONPATH=$FINOPT_HOME:$PYTHONPATH
+python $FINOPT_HOME/cep/ib_mds.py $FINOPT_HOME/config/app.cfg
+

sh/run_mds.sh~

@@ -1,4 +1,4 @@
 #!/bin/bash
 ROOT=/home/larry-13.04/workspace/finopt
 export PYTHONPATH=$ROOT/src
-python $ROOT/src/cep/ib_mds.py $ROOT/config/app.cfg
+python $ROOT/src/cep/ib_mds.py $ROOT/src/config/app.cfg

sh/run_opt_serve.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-ROOT=/home/larry-13.04/workspace/finopt
+ROOT={replace-path}
 export PYTHONPATH=$ROOT/src
 python $ROOT/src/finopt/opt_serve.py $ROOT/src/config/app.cfg

sh/run_opt_serve.sh~

@@ -1,4 +1,4 @@
 #!/bin/bash
 ROOT=/home/larry-13.04/workspace/finopt
 export PYTHONPATH=$ROOT/src
-python $ROOT/src/opt_serve.py $ROOT/src/config/app.cfg
+python $ROOT/src/finopt/opt_serve.py $ROOT/src/config/app.cfg

sh/run_options_data.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-ROOT=/home/larry-13.04/workspace/finopt
+ROOT={replace-path}
 export PYTHONPATH=$ROOT/src
 python $ROOT/src/finopt/options_data.py $ROOT/src/config/app.cfg

sh/run_options_data.sh~

@@ -1,4 +1,4 @@
 #!/bin/bash
 ROOT=/home/larry-13.04/workspace/finopt
 export PYTHONPATH=$ROOT/src
-python $ROOT/src/options_data.py $ROOT/src/config/app.cfg
+python $ROOT/src/finopt/options_data.py $ROOT/src/config/app.cfg