X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=logger.py;h=0b083ca670b559560f5758011d8c7d87df4c6756;hb=refs%2Fheads%2Ftrellis;hp=195c1d882fb73fc5729c79fa0777ad97c1fea0b9;hpb=1694282a88ff0e093a53725023df1953a2b6a92d;p=nodemanager.git

diff --git a/logger.py b/logger.py
index 195c1d8..0b083ca 100644
--- a/logger.py
+++ b/logger.py
@@ -10,9 +10,28 @@ import traceback
 
 
 LOG_FILE = '/var/log/nm'
+LOG_SLIVERS = '/var/log/getslivers.txt'
 
-def log(msg):
-    """Write <msg> to the log file."""
+# Thierry - trying to debug this for 4.2
+# basically define 3 levels
+LOG_NONE=0
+LOG_NODE=1
+LOG_VERBOSE=2
+# default is to log a reasonable amount of stuff for when running on operational nodes
+LOG_LEVEL=1
+
+def set_level(level):
+    global LOG_LEVEL
+    assert level in [LOG_NONE,LOG_NODE,LOG_VERBOSE]
+    LOG_LEVEL=level
+
+def verbose(msg):
+    log(msg,LOG_VERBOSE)
+
+def log(msg,level=LOG_NODE):
+    """Write <msg> to the log file if level >= current log level (default LOG_NODE)."""
+    if (level > LOG_LEVEL):
+        return
     try:
         fd = os.open(LOG_FILE, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0600)
         if not msg.endswith('\n'): msg += '\n'
@@ -29,7 +48,19 @@ def log_call(*args):
 
 def log_exc(name = None):
     """Log the traceback resulting from an exception."""
-   if name:  
-   		log("operation on %s failed.  \n %s" %(self.name, traceback.format_exc()))
-   else:
+    if name:  
+        log("operation on %s failed.  \n %s" %(name, traceback.format_exc()))
+    else:
         log(traceback.format_exc())
+
+def log_slivers (data):
+    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.write(now+'\n')
+        pp=pprint.PrettyPrinter(stream=f,indent=2)
+        pp.pprint(data)
+        f.close()
+    except:
+        log_verbose('Cannot save GetSlivers in %s'%LOG_SLIVERS)