Changeset 940 for trunk/Monitoring/Watch

Timestamp:

08/26/13 09:45:18 (11 years ago)

Author:

jripsl

Message:

Improve logging.

File:

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

trunk/Monitoring/Watch/watch

@@ -22 +22 @@
 from email.mime.text import MIMEText
 import datetime
+import logging
 
 # line below is to include "smon" package in the search path
@@ -31 +32 @@
 CSTE_BROKER_HOST='cstest-broker.ipsl.jussieu.fr' # cstest
 #CSTE_BROKER_HOST='localhost' # vesg4
+CSTE_LOG_DIR='/var/log/cssupervisor'
+CSTE_LOG_FILENAME_MAIN='supervisor.log'
+CSTE_LOG_FILENAME_DEBUG='debug.log'
+CSTE_LOG_FILENAME_MSG='message.log' # log AMQP msgs
+CSTE_LOG_FILE_MAIN="%s/%s"%(CSTE_LOG_DIR,CSTE_LOG_FILENAME_MAIN)
+
+# logger init.
+logging.basicConfig(filename=CSTE_LOG_FILE_MAIN,level=logging.INFO,)
+
 
 class Mail():
@@ -116 +126 @@
                         simulation=smon.types.Simulation(name=message.simuid,status="running")
 
-
                         repo_io.create_simulation(simulation)
 
@@ -124 +133 @@
 
         @classmethod
-        def print_stdout(cls,message):
-                # used for debug
+        def log_debug(cls,line):
+                cls.log(CSTE_LOG_FILENAME_DEBUG,line)
+
+        @classmethod
+        def log(cls,filename,line):
+                with open("%s/%s"%(CSTE_LOG_DIR,filename), "a") as log_file:
+                        log_file.write("%s %s\n"%(datetime.datetime.now().strftime('%Y%m%d_%H%M%S'), line))
+
+        @classmethod
+        def log_msg(cls,message):
+                line="%s %s %s %s"%(message.code,message.jobid,message.timestamp,message.command)
+                cls.log(CSTE_LOG_FILENAME_MSG,line)
 
                 """
                 if message.file is not None:
-                        print "%s %s %s %s %s\n"%(message.code,message.jobid,message.command,message.timestamp,message.file)
+                        "%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)
-                #pass
-
-        @classmethod
-        def log(cls,message):
-                with open("/opt/supervisor/log/supervisor.log", "a") as log_file:
-                        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))
+                "%s %s %s %s\n"%(message.code,message.jobid,message.command,message.timestamp)
+                """
 
         @classmethod
@@ -163 +174 @@
         # 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"],
-                                "1100":["log", "store_msg", "print_stdout"],
-                                "2000":["log", "store_msg", "print_stdout"],
-                                "3000":["log", "store_msg", "print_stdout"],
+        mapping = { "0000":["crea_sim", "log_msg", "store_msg"],
+                                "0100":["log_msg", "store_msg", "set_sim_status_to_complete"],
+                                "1000":["log_msg", "store_msg"],
+                                "1100":["log_msg", "store_msg"],
+                                "2000":["log_msg", "store_msg"],
+                                "3000":["log_msg", "store_msg"],
                                 "8888":["cleanup"],
-                                "9000":["log", "store_msg", "print_stdout"],
-                                "9999":["log", "store_msg", "print_stdout", "set_sim_status_to_error"] }
+                                "9000":["log_msg", "store_msg"],
+                                "9999":["log_msg", "store_msg", "set_sim_status_to_error"] }
 
         # prod
@@ -178 +189 @@
         #
         """
-        mapping = { "0000":["crea_sim", "log", "store_msg"],
-                                "0100":["log", "store_msg", "set_sim_status_to_complete"],
-                                "1000":["log", "store_msg"],
-                                "1100":["log", "store_msg"],
-                                "2000":["log", "store_msg"],
-                                "3000":["log", "store_msg"],
+        mapping = { "0000":["crea_sim", "log_msg", "store_msg"],
+                                "0100":["log_msg", "store_msg", "set_sim_status_to_complete"],
+                                "1000":["log_msg", "store_msg"],
+                                "1100":["log_msg", "store_msg"],
+                                "2000":["log_msg", "store_msg"],
+                                "3000":["log_msg", "store_msg"],
                                 "8888":["cleanup"],
-                                "9000":["log", "store_msg", "mail"],
-                                "9999":["log", "store_msg", "set_sim_status_to_error", "mail"] }
+                                "9000":["log_msg", "store_msg", "mail"],
+                                "9999":["log_msg", "store_msg", "set_sim_status_to_error", "mail"] }
         """
 
@@ -218 +229 @@
                 self.channel = connection.channel()
 
-
-                print ' [*] Waiting for messages. To exit press CTRL+C'
+                logging.info("[*] Waiting for messages")
 
                 def callback(ch, method, properties, raw_msg):
@@ -237 +247 @@
 
                                 # debug
-                                #print " [x] Received %s" % field
+                                #logging.debug(" [x] Received %s"%field)
 
                                 splitted_field=field.split(":")
@@ -248 +258 @@
 
                         # debug
-                        #print " [x] Received %s (encoded)" % l__tmp_dic["body"]
+                        #logging.debug(" [x] Received %s (encoded)" % l__tmp_dic["body"])
 
                         
@@ -256 +266 @@
 
                         # debug
-                        #print " [x] Received %s" % raw_msg
-                        #print " [x] Received %s (uudecoded)" % base64_decoded_msg 
-                        #print " [x] Received %s (uudecoded)" % base64_decoded_msg 
+                        #logging.debug(" [x] Received %s" % raw_msg)
+                        #logging.debug(" [x] Received %s (uudecoded)" % base64_decoded_msg )
+                        #logging.debug(" [x] Received %s (uudecoded)" % base64_decoded_msg )
 
 
@@ -268 +278 @@
 
                                 # non working
-                                #print message.type
+                                #logging.debug("DEB003 - %s"%message.type)
 
                                 # working
-                                #print message.code
+                                #logging.debug("DEB009 - %s"%message.code)
 
 
 
                         except Exception,e:
-                                print "ERR009 - exception occurs (exception=%s,msg=%s)"%(str(e),base64_decoded_msg)
-
-                                traceback.print_exc()
+
+                                logging.exception("ERR009 - exception occurs (exception=%s)"%(str(e),))
+
+                                Actions.log_debug("DEB021 - %s"%base64_decoded_msg) 
+
                                 raise
 
@@ -301 +313 @@
 
                         except Exception,e:
-                                print "ERR019 - exception occurs (exception=%s)"%(str(e))
-                                #print "ERR019 - exception occurs (exception=%s,msg=%s)"%(str(e),base64_decoded_msg)
-
-                                traceback.print_exc()
+                                logging.exception("ERR019 - exception occurs (exception=%s)"%(str(e),))
+
+                                Actions.log_debug("DEB020 - %s"%base64_decoded_msg) 
 
                                 raise
@@ -324 +335 @@
 
 def signal_handler(signal, frame):
-                print 'You pressed Ctrl+C!'
+                logging.info("TERM signal received: exiting.")
                 Watcher.channel.stop_consuming()
                 Watcher.stop()
@@ -331 +342 @@
 if __name__ == '__main__':
 
+        signal.signal(signal.SIGTERM, signal_handler)
         signal.signal(signal.SIGINT, signal_handler)
 
@@ -348 +360 @@
 
                 sys.exit(1)
+# vim: set ts=4 sw=4 :