X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=logger.py;h=eff93e69d6a2b2040f1a30e17ba3e9a99675e34d;hb=7aa5872239d04b2d0a7cb3b00a9c14b5ea18d013;hp=90ee7555c345b0de97326c35c81944a5e16eec83;hpb=ecf4e0152b6b0a39aa1af8f1330bec1aabad9629;p=nodemanager.git

diff --git a/logger.py b/logger.py
index 90ee755..eff93e6 100644
--- a/logger.py
+++ b/logger.py
@@ -26,7 +26,7 @@ def set_level(level):
     LOG_LEVEL=level
 
 def verbose(msg):
-    log(msg,LOG_VERBOSE)
+    log('(v) '+msg,LOG_VERBOSE)
 
 def log(msg,level=LOG_NODE):
     """Write <msg> to the log file if level >= current log level (default LOG_NODE)."""
@@ -49,20 +49,26 @@ def log_call(*args):
         if child.returncode:
                 raise Exception("command failed:\n stdout - %s\n stderr - %s" % \
                         (child.stdout.readlines(), child.stderr.readlines()))
-    except: log_exc()
+    except: log_exc('failed to run command %s' % ' '.join(args))
 
-def log_exc(name = None):
+def log_exc(msg="",name=None):
     """Log the traceback resulting from an exception."""
-    if name:  
-        log("operation on %s failed.  \n %s" %(name, traceback.format_exc()))
+    if name: 
+        log("%s: EXCEPTION caught <%s> \n %s" %(name, msg, traceback.format_exc()))
     else:
-        log(traceback.format_exc())
+        log("EXCEPTION caught <%s> \n %s" %(msg, traceback.format_exc()))
+
+# for some reason the various modules are still triggered even when the
+# data from PLC cannot be reached
+# we show this message instead of the exception stack instead in this case
+def log_missing_data (msg,key):
+    log("%s: could not find the %s key in data (PLC connection down?) - IGNORED"%(msg,key))
 
 def log_data_in_file (data, file, message=""):
     import pprint, time
     try:
         f=open(file,'w')
-        now=time.strftime("Last update: %Y.%m.%d at %H:%M:%S", time.localtime())
+        now=time.strftime("Last update: %Y.%m.%d at %H:%M:%S %Z", time.localtime())
         f.write(now+'\n')
         if message: f.write('Message:'+message+'\n')
         pp=pprint.PrettyPrinter(stream=f,indent=2)