Changeset 877

Timestamp:

06/12/13 12:00:14 (11 years ago)

Author:

jripsl

Message:

Fix bug (incorrect simulation_id was used in message table).

Location:

trunk/Monitoring

Files:

• Analyze/analyze (modified) (1 diff)
• Watch/watch (modified) (3 diffs)
• smon/local_repo.py (modified) (1 diff)
• smon/repo_io.py (modified) (2 diffs)

trunk/Monitoring/Analyze/analyze

@@ -73 +73 @@
 
                                 message=repo_io.retrieve_last_message(simulation)
+
                         except types.MessageNotFoundException, e:
 

trunk/Monitoring/Watch/watch

@@ -57 +57 @@
         @classmethod
         def store_msg(cls,message):
-                repo_io.create_message(message)
+
+                # the simu exists when we are here (see TAG0001 tag)
+                s=repo_io.retrieve_simulation(message.simuid)
+
+                repo_io.create_message(message,s)
 
         @classmethod
@@ -127 +131 @@
 
         # debug
-        mapping = { "0000":["log", "store_msg", "print_stdout", "crea_sim"],
+        #
+        # TAG0001: note that crea_sim must be BEFORE store_msg in the list (because when we insert the msg, we need the simu_id)
+        #
+        mapping = { "0000":["crea_sim", "log", "store_msg", "print_stdout"],
                                 "0100":["log", "store_msg", "print_stdout", "set_sim_status_to_complete"],
                                 "1000":["log", "store_msg", "print_stdout"],
@@ -138 +145 @@
 
         # prod
+        #
+        # TAG0001: note that crea_sim must be BEFORE store_msg in the list (because when we insert the msg, we need the simu_id)
+        #
         """
-        mapping = { "0000":["log", "store_msg", "crea_sim"],
+        mapping = { "0000":["crea_sim", "log", "store_msg"],
                                 "0100":["log", "store_msg", "set_sim_status_to_complete"],
                                 "1000":["log", "store_msg"],

trunk/Monitoring/smon/local_repo.py

@@ -140 +140 @@
         _conn.commit()
 
-def create_message(message):
+def create_message(message,simulation):
         
-        _conn.execute("insert into message (simulation_id,crea_date) values (?,?)",(message.simuid, message.timestamp))
+        _conn.execute("insert into message (simulation_id,crea_date) values (?,?)",(simulation.id, message.timestamp))
 
         _conn.commit()

trunk/Monitoring/smon/repo_io.py

@@ -81 +81 @@
 
 def populate_tables_with_sample():
+        """
+        used only by "repo-state" pgm
+        """
+        
         repo.populate_tables_with_sample()
 
 def retrieve_simulations():
+        """
+        used by get_running_simulations
+        """
         return repo.retrieve_simulations()
 
@@ -252 +259 @@
                 raise Exception("ERR019 - incorrect mode")
 
-def create_message(message):
-        if mode==CSTE_MODE_LOCAL_REPO:
-                repo.create_message(message)
+def create_message(message,simulation):
+        if mode==CSTE_MODE_LOCAL_REPO:
+                repo.create_message(message,simulation)
         elif mode==CSTE_MODE_REMOTE_REPO: