Changeset 879 for trunk/Monitoring/Watch/watch

Timestamp:

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

Author:

jripsl

Message:

Fix heartbeat test.

File:

• trunk/Monitoring/Watch/watch (modified) (6 diffs)

trunk/Monitoring/Watch/watch

@@ -21 +21 @@
 import smtplib
 from email.mime.text import MIMEText
-from datetime import datetime
+import datetime
 
 # line below is to include "smon" package in the search path
@@ -58 +58 @@
         def store_msg(cls,message):
 
-                # the simu exists when we are here (see TAG0001 tag)
-                s=repo_io.retrieve_simulation(message.simuid)
-
-                repo_io.create_message(message,s)
+                try:
+
+                        # the simu exists when we are here (see TAG0001 tag)
+                        s=repo_io.retrieve_simulation(message.simuid)
+
+                        repo_io.create_message(message,s)
+
+                        sys.exit()
+
+                except:
+                        traceback.print_exc()
+                        raise
 
         @classmethod
@@ -70 +78 @@
         def set_sim_status_to_error(cls,message):
 
-                s=repo_io.retrieve_simulation(message.simuid)
-
-                s.status="error"
-
-                repo_io.update_simulation_status(s)
+                try:
+
+                        s=repo_io.retrieve_simulation(message.simuid)
+
+                        s.status="error"
+
+                        repo_io.update_simulation_status(s)
+
+                except:
+                        traceback.print_exc()
+                        raise
 
         @classmethod
@@ -103 +117 @@
                 # used for debug
 
+                """
                 if message.file is not None:
                         print "%s %s %s %s %s\n"%(message.code,message.jobid,message.command,message.timestamp,message.file)
                 else:
                         print "%s %s %s %s\n"%(message.code,message.jobid,message.command,message.timestamp)
+                """
+
+                print "%s %s %s %s\n"%(message.code,message.jobid,message.command,message.timestamp)
 
         @classmethod
         def log(cls,message):
                 with open("/home/jripsl/supervisor/log/supervisor.log", "a") as log_file:
-                        log_file.write("%s %s %s %s %s\n"%(datetime.now().strftime('%Y%m%d_%H%M%S'), message.code,message.jobid,message.timestamp,message.command))
+                        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))
 
         @classmethod
@@ -239 +257 @@
                                 message=smon.types.Message(JSON_msg)      # all JSON object members will be available in smon.types.Message object
 
+                                # non working
+                                #print message.type
+
+                                # working
+                                #print message.code
+
 
 
@@ -249 +273 @@
 
 
-                        # manage config-card file which is attached to the "0000" type message (this file is base64 encoded and need to be unencoded)
+                        # manage config-card file which is attached to the "0000" code message (this file is base64 encoded and need to be unencoded)
                         #
                         if "file" in l__tmp_dic: