Changeset 879 for trunk/Monitoring/smon/local_repo.py

Timestamp:

06/13/13 07:08:13 (11 years ago)

Author:

jripsl

Message:

Fix heartbeat test.

File:

• trunk/Monitoring/smon/local_repo.py (modified) (5 diffs)

trunk/Monitoring/smon/local_repo.py

@@ -59 +59 @@
         _conn.execute("create unique index if not exists idx_simulation_1 on simulation (name)")
 
-        _conn.execute("create table if not exists message (id INTEGER PRIMARY KEY, simulation_id TEXT, body TEXT, crea_date TEXT)") # TODO: check how to use INT datatype for simulation_id column
+        _conn.execute("create table if not exists message (id INTEGER PRIMARY KEY, simulation_id TEXT, body TEXT, timestamp TEXT, crea_date TEXT)") # TODO: check how to use INT datatype for simulation_id column
 
 def cleanup():
@@ -102 +102 @@
 
         if rs is None:
-                raise Exception()
+                raise Exception("name=%s"%name)
 
         return types.Simulation(name=rs[0],id=rs[1],status=rs[2])
@@ -126 +126 @@
         c=_conn.cursor()
 
-        _conn.execute("select id from message where simulation_id = ?",(simulation.id,))
+        c.execute("select id from message where simulation_id = ?",(simulation.id,))
 
         rs=c.fetchone()
@@ -142 +142 @@
 def create_message(message,simulation):
         
-        _conn.execute("insert into message (simulation_id,crea_date) values (?,?)",(simulation.id, message.timestamp))
+        _conn.execute("insert into message (simulation_id,timestamp,crea_date) values (?,?,datetime('now', 'localtime'))",(simulation.id, message.timestamp))
 
         _conn.commit()
@@ -149 +149 @@
         c=_conn.cursor()
 
-        _conn.execute("select id, simulation_id, body, crea_date from message where simulation_id=? order by crea_date desc limit 1",(simulation.id,))
+        # debug
+        #print "simulation_id=%d"%simulation.id
+
+        c.execute("select id, simulation_id, body, timestamp, crea_date from message where simulation_id=? order by crea_date desc limit 1",(simulation.id,))
 
         rs=c.fetchone()
 
         if rs is None:
+
+                # debug
+                #print "simulation not found (%d)"%simulation.id
+
                 raise types.MessageNotFoundException()
 
-        return types.Message(id=rs[0],simulation_id=rs[1],body=rs[2],timestamp=rs[3])
+        # HACK (we want the Message constructor to support BOTH **kw AND kw)
+        di={}
+        di["id"]=rs[0]
+        di["simulation_id"]=rs[1]
+        di["body"]=rs[2]
+        di["timestamp"]=id=rs[3]
+        di["crea_date"]=rs[4]
+
+        m=types.Message(di)
+
+        return m
+
+