Changeset 876 for trunk/Monitoring/smon

Timestamp:

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

Author:

jripsl

Message:

Timeout test impl.
Add timestamp.

Location:

trunk/Monitoring/smon

Files:

• local_repo.py (modified) (4 diffs)
• repo_io.py (modified) (1 diff)
• types.py (modified) (3 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)") # 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, crea_date TEXT)") # TODO: check how to use INT datatype for simulation_id column
 
 def cleanup():
@@ -84 +84 @@
         rs=c.fetchone()
         while rs is not None:
-                li.append(types.Simulation(name=rs[0],id=rs[1],status=rs[2]))
+
+                s=types.Simulation(name=rs[0],id=rs[1],status=rs[2])
+
+                li.append(s)
+
+
                 rs=c.fetchone()
 
@@ -136 +141 @@
 
 def create_message(message):
-        _conn.execute("insert into message (simulation_id) values (?)",(message.simuid,))
+        
+        _conn.execute("insert into message (simulation_id,crea_date) values (?,?)",(message.simuid, message.timestamp))
 
         _conn.commit()
@@ -143 +149 @@
         c=_conn.cursor()
 
-        _conn.execute("select id, content from message where simulation_id=? order by id desc limit 1",(simulation.id,))
+        _conn.execute("select id, simulation_id, body, crea_date from message where simulation_id=? order by crea_date desc limit 1",(simulation.id,))
 
         rs=c.fetchone()
 
         if rs is None:
-                raise Exception()
+                raise types.MessageNotFoundException()
 
-        return types.Message(id=rs[0])
+        return types.Message(id=rs[0],simulation_id=rs[1],body=rs[2],timestamp=rs[3])

trunk/Monitoring/smon/repo_io.py

@@ -300 +300 @@
         running_simulation=[]
 
-        for s in retrieve_simulation():
+        for s in retrieve_simulations():
                 if s.status=="running":
                         running_simulation.append(s)

trunk/Monitoring/smon/types.py

@@ -28 +28 @@
                 return ",".join(['%s=%s'%(k,str(v)) for (k,v) in self.__dict__.iteritems()])
 
+class MessageNotFoundException(SMONException):
+        pass
+
 class Tree():
 
@@ -43 +46 @@
                 self.status=kw.get("status")
                 self.name=kw.get("name")
+                self.id=kw.get("id")
 
         def __str__(self):
@@ -49 +53 @@
 class Message():
         file=None
+        simuid=None
+        jobid=None
+        timestamp=None
+        command=None
 
         def __init__(self,JSON_KW):