Changeset 937

Timestamp:

08/23/13 10:13:15 (11 years ago)

Author:

jripsl

Message:

Create AMQP queue on supervisor side if not exists already.

Location:

trunk/Monitoring

Files:

• Watch/README (modified) (1 diff)
• Watch/watch (modified) (4 diffs)
• doc/README (modified) (1 diff)
• smon/local_repo.py (modified) (1 diff)
• smon/repo_io.py (modified) (4 diffs)

trunk/Monitoring/Watch/README

@@ -1 +1 @@
 - to run the watcher, do
+        - cd Watch
         - source /opt/python2.6_ve/bin/activate
         - python watch

trunk/Monitoring/Watch/watch

@@ -24 +24 @@
 
 # line below is to include "smon" package in the search path
-sys.path.append("/home/jripsl/snapshot/Monitoring")
+sys.path.append("/opt/supervisor/Monitoring")
 
 import smon.repo_io as repo_io
 import smon.types
 
+CSTE_BROKER_HOST='cstest-broker.ipsl.jussieu.fr' # cstest
+#CSTE_BROKER_HOST='localhost' # vesg4
 
 class Mail():
@@ -137 +139 @@
         @classmethod
         def log(cls,message):
-                with open("/home/jripsl/supervisor/log/supervisor.log", "a") as log_file:
+                with open("/opt/supervisor/log/supervisor.log", "a") as log_file:
                         log_file.write("%s %s %s %s %s\n"%(datetime.datetime.now().strftime('%Y%m%d_%H%M%S'), message.code,message.jobid,message.timestamp,message.command))
 
@@ -213 +215 @@
                 """
 
-                connection = pika.BlockingConnection(pika.ConnectionParameters( host='localhost'))
+                connection = pika.BlockingConnection(pika.ConnectionParameters(host=CSTE_BROKER_HOST))
                 self.channel = connection.channel()
 
-                #self.channel.queue_declare(queue='myqueue')
 
                 print ' [*] Waiting for messages. To exit press CTRL+C'
@@ -311 +312 @@
                         #time.sleep(0.5)
 
+                self.channel.queue_declare(queue='myqueue')
 
                 self.channel.basic_consume(callback, queue='myqueue', no_ack=True)

trunk/Monitoring/doc/README

@@ -69 +69 @@
                                 - svn co svn+ssh://<login here>@forge.ipsl.jussieu.fr/ipsl/forge/projets/prodiguer/svn/sw/src/python/trunk/prodiguer_shared/src
                 - Supervisor python script installation
+                        - mkdir /opt/supervisor/local_db
+                        - mkdir /opt/supervisor/log
                         - svn co svn+ssh://<login here>@forge.ipsl.jussieu.fr/ipsl/forge/projets/libigcm/svn/trunk/Monitoring
                         - edit "watch" script and edit line below accordingly
-                                - sys.path.append("/home/jripsl/snapshot/src") 
+                                - sys.path.append("<snapshot_dir>/src") 
                         - smon/repo_io.py
-                                - sys.path.append("/home/jripsl/snapshot/src") 
+                                - sys.path.append("<snapshot_dir>/src") 
         - test
                 - connectivity test

trunk/Monitoring/smon/local_repo.py

@@ -26 +26 @@
                 raise Exception()
 
-        db_file="/home/jripsl/supervisor/local_db/local_repo.db"
+        db_file="/opt/supervisor/local_db/supervisor.db"
         #db_file=":memory:"
 

trunk/Monitoring/smon/repo_io.py

@@ -20 +20 @@
 
 # line below is to include Prodiguer database I/O library in the search path
-sys.path.append("/home/jripsl/snapshot/src/prodiguer_shared/src")
+sys.path.append("/opt/supervisor/prodiguer_lib/src")
 
 
@@ -33 +33 @@
 
 
-# HACK
-import prodiguer_shared.repo.session as repo_session
-import prodiguer_shared.models as models
-
-
-# Test constants.
-_SIM_ACTIVITY = 'IPSL'
-_SIM_COMPUTE_NODE = 'TGCC'
-_SIM_COMPUTE_NODE_LOGIN = 'p86denv'
-_SIM_COMPUTE_NODE_MACHINE = 'TGCC - Curie'
-_SIM_EXECUTION_START_DATE = datetime.datetime.now()
-_SIM_EXECUTION_STATE = models.EXECUTION_STATE_RUNNING
-_SIM_EXPERIMENT = '1pctCO2'
-_SIM_MODEL_ENGINE = 'IPSL-CM5A-LR'
-_SIM_SPACE = models.SIMULATION_SPACE_TEST
-_MSG_TYPE = "0000"
-_MSG_CONTENT1 = "12345690"
-_MSG_CONTENT2 = "12345690"
 
 
@@ -59 +41 @@
 
 # set mode
-mode=CSTE_MODE_REMOTE_REPO
-#mode=CSTE_MODE_LOCAL_REPO
-
-# set repository driver
+#mode=CSTE_MODE_REMOTE_REPO
+mode=CSTE_MODE_LOCAL_REPO
+
+# mode specific init. (e.g. repository driver)
 if mode==CSTE_MODE_REMOTE_REPO_STUB:
         raise Exception()
@@ -72 +54 @@
 
 
+        # HACK
+        # (uncomment those two lines if use prodiguer repo)
+        import prodiguer_shared.repo.session as repo_session
+        import prodiguer_shared.models as models
+
+
+        # Test constants.
+        _SIM_ACTIVITY = 'IPSL'
+        _SIM_COMPUTE_NODE = 'TGCC'
+        _SIM_COMPUTE_NODE_LOGIN = 'p86denv'
+        _SIM_COMPUTE_NODE_MACHINE = 'TGCC - Curie'
+        _SIM_EXECUTION_START_DATE = datetime.datetime.now()
+        _SIM_EXECUTION_STATE = models.EXECUTION_STATE_RUNNING
+        _SIM_EXPERIMENT = '1pctCO2'
+        _SIM_MODEL_ENGINE = 'IPSL-CM5A-LR'
+        _SIM_SPACE = models.SIMULATION_SPACE_TEST
+        _MSG_TYPE = "0000"
+        _MSG_CONTENT1 = "12345690"
+        _MSG_CONTENT2 = "12345690"
+
 elif mode==CSTE_MODE_LOCAL_REPO:
+
         import local_repo as repo
+
+
 else:
         raise Exception("ERR001 - incorrect mode")
+