X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=logger.py;h=0b083ca670b559560f5758011d8c7d87df4c6756;hb=187bb4c3140fd0820a92d61eeda004b52403a955;hp=a3cff1e9a14d9b5d75f63255cfa6485eb702429d;hpb=8043da14ad0a8f76c20c8ff4e5ce2d8e1c2131df;p=nodemanager.git

diff --git a/logger.py b/logger.py
index a3cff1e..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'
@@ -27,6 +46,21 @@ def log_call(*args):
     try: subprocess.call(args, close_fds=True)
     except: log_exc()
 
-def log_exc():
+def log_exc(name = None):
     """Log the traceback resulting from an exception."""
-    log(traceback.format_exc())
+    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)