fixed broken slice-creation

[nodemanager.git] / logger.py

diff --git a/logger.py b/logger.py
index 3fedde9..7dff05e 100644 (file)
--- a/logger.py
+++ b/logger.py
@@ -1,6 +1,6 @@
-#
-# Something relevant
-#
+# $Id$
+# $URL$
+
 """A very simple logger that tries to be concurrency-safe."""
 
 import os, sys
@@ -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)."""
@@ -43,24 +43,33 @@ def log(msg,level=LOG_NODE):
 
 def log_call(*args):
     log('running command %s' % ' '.join(args))
-    try: subprocess.check_call(args, close_fds=True)
-    except: log_exc()
+    try: 
+        child = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+        child.wait() # wait for proc to hang up
+        if child.returncode:
+                raise Exception("command failed:\n stdout - %s\n stderr - %s" % \
+                        (child.stdout.readlines(), child.stderr.readlines()))
+    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()))
 
-def log_slivers (data):
+def log_data_in_file (data, file, message=""):
     import pprint, time
     try:
-        f=open(LOG_SLIVERS,'w')
-        now=time.strftime("GetSlivers stored on %Y.%m.%d at %H:%M:%S", time.localtime())
+        f=open(file,'w')
+        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)
         pp.pprint(data)
         f.close()
     except:
-        log_verbose('Cannot save GetSlivers in %s'%LOG_SLIVERS)
+        log_verbose('log_data_in_file failed - file=%s - message=%r'%(file,message))
+
+def log_slivers (data):
+    log_data_in_file (data, LOG_SLIVERS, "raw GetSlivers")