X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=logger.py;h=3d3400ee854cd2b0a766954c454649072f68feec;hb=d88a6b97acdd56a303918cac7ed16ffad269d648;hp=f0088064320916cf48f8d6492a13d5fd0d579b93;hpb=33bb6d66fd29039576844c49ceceefe905d68fd3;p=nodemanager.git diff --git a/logger.py b/logger.py index f008806..3d3400e 100644 --- a/logger.py +++ b/logger.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ """A very simple logger that tries to be concurrency-safe.""" @@ -18,12 +16,15 @@ 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 +LOG_LEVEL=LOG_NODE def set_level(level): global LOG_LEVEL - assert level in [LOG_NONE,LOG_NODE,LOG_VERBOSE] - LOG_LEVEL=level + try: + assert level in [LOG_NONE,LOG_NODE,LOG_VERBOSE] + LOG_LEVEL=level + except: + logger.log("Failed to set LOG_LEVEL to %s"%level) def verbose(msg): log('(v) '+msg,LOG_VERBOSE) @@ -43,7 +44,7 @@ def log(msg,level=LOG_NODE): def log_exc(msg="",name=None): """Log the traceback resulting from an exception.""" - if name: + if name: log("%s: EXCEPTION caught <%s> \n %s" %(name, msg, traceback.format_exc())) else: log("EXCEPTION caught <%s> \n %s" %(msg, traceback.format_exc())) @@ -67,7 +68,7 @@ def log_data_in_file (data, file, message="",level=LOG_NODE): pp=pprint.PrettyPrinter(stream=f,indent=2) pp.pprint(data) f.close() - log("logger:.log_data_in_file Owerwrote %s"%file) + verbose("logger:.log_data_in_file Owerwrote %s"%file) except: log_exc('logger.log_data_in_file failed - file=%s - message=%r'%(file,message)) @@ -77,14 +78,14 @@ def log_database (db): log_data_in_file (db, LOG_DATABASE, "raw database") #################### child processes -# avoid waiting until the process returns; +# avoid waiting until the process returns; # that makes debugging of hanging children hard class Buffer: def __init__ (self,message='log_call: '): self.buffer='' self.message=message - + def add (self,c): self.buffer += c if c=='\n': self.flush() @@ -105,8 +106,8 @@ def log_call(command,timeout=default_timeout_minutes*60,poll=1): verbose("log_call: poll=%r s" % poll) trigger=time.time()+timeout result = False - try: - child = subprocess.Popen(command, bufsize=1, + try: + child = subprocess.Popen(command, bufsize=1, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) buffer = Buffer() while True: @@ -119,7 +120,7 @@ def log_call(command,timeout=default_timeout_minutes*60,poll=1): if returncode != None: buffer.flush() # child is done and return 0 - if returncode == 0: + if returncode == 0: log("log_call:end command (%s) completed" % message) result=True break