Changeset 965 for trunk/Monitoring

Timestamp:

11/07/13 14:49:45 (10 years ago)

Author:

jripsl

Message:

• fix database connectivity test script.

Location:

trunk/Monitoring/smon

Files:

• repo_io.py (modified) (7 diffs)
• test_remote_repo.py (modified) (1 diff)

trunk/Monitoring/smon/repo_io.py

@@ -19 +19 @@
 import datetime
 
-# line below is to include Prodiguer database I/O library in the search path
-sys.path.append("/opt/supervisor/prodiguer_lib/src")
-
-
-import types
+
+
 
 
@@ -33 +30 @@
 
 
-
-
-
+g__remote_database_host="ib-pp-db-dev.ipslnet"
+g__remote_database_port="5432"
+g__remote_database_name="pdgr_1_0b5"
 
 
@@ -41 +38 @@
 
 # set mode
-#mode=CSTE_MODE_REMOTE_REPO
-mode=CSTE_MODE_LOCAL_REPO
+mode=CSTE_MODE_REMOTE_REPO
+#mode=CSTE_MODE_LOCAL_REPO
 
 # mode specific init. (e.g. repository driver)
@@ -50 +47 @@
 elif mode==CSTE_MODE_REMOTE_REPO:
 
+        # line below is to include Prodiguer database I/O library in the search path
+        sys.path.append("/opt/supervisor/prodiguer_lib/src")
+
+        import types
+
         # import Prodiguer database I/O library
         import prodiguer_shared.mq.hooks as repo
-
-
-        # HACK
-        # (uncomment those two lines if use prodiguer repo)
         import prodiguer_shared.repo.session as repo_session
         import prodiguer_shared.models as models
@@ -94 +92 @@
                 repo.connect()
         elif mode==CSTE_MODE_REMOTE_REPO:
-                _CONNECTION = "postgresql://postgres:Silence107!@ib-pp-db-dev.ipslnet:5432/pdgr_1_0b5"
+                _CONNECTION = "postgresql://postgres:Silence107!@%s:%s/%s"%(g__remote_database_host,g__remote_database_port,g__remote_database_name)
                 repo_session.start(_CONNECTION)
 
@@ -245 +243 @@
                         simulation=repo.retrieve_simulation(name)
                 except:
-                        traceback.print_exc()
+                        raise
 
         elif mode==CSTE_MODE_REMOTE_REPO:
@@ -356 +354 @@
                         repo.update_simulation_status(simulation)
                 except:
-                        traceback.print_exc()
+                        raise
 
         elif mode==CSTE_MODE_REMOTE_REPO:

trunk/Monitoring/smon/test_remote_repo.py

@@ +1 @@
+
+
+
 import sys
-sys.path.append("/home/jripsl/snapshot/src")
-
 import elixir
 
-#  Module imports.
-import prodiguer_shared.repo as repo
-import prodiguer_shared.repo.mq.hooks as mq_hooks
+
+# import Prodiguer database I/O library
+sys.path.append("/opt/supervisor/prodiguer_lib/src")
+import prodiguer_shared.mq.hooks as repo
+import prodiguer_shared.repo.session as repo_session
 
 
-# Repo connection string.
-_CONNECTION = "postgresql://postgres:Silence107!@localhost:5432/prodiguer"
+# dbname
+#  pdgr_1_0b5
+#  prodiguer
+
+# connection string.
+#_CONNECTION = "postgresql://postgres:Silence107!@localhost:5432/prodiguer"
+_CONNECTION = "postgresql://postgres:Silence107!@ib-pp-db-dev.ipslnet:5432/pdgr_1_0b5"
+
+
+
 
 # Get prodiguer session handler.
-repo.connect(_CONNECTION)
+repo_session.start(_CONNECTION)
 
 # Invoke hooks.
-mq_hooks.update_simulation_status('1pctCO22', 'ERROR')
+repo.update_simulation_status('1pctCO22', 'ERROR')
 
 # Commit.
-repo.commit()
+repo_session.commit()