X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fsfalogging.py;h=3ec03506bb1926c510b09f817e85920e201e29e3;hb=3fef415cbd03da2d4a042f8450d564e68ed312f4;hp=ccb140094644238b6a97db8fe379572d8c973683;hpb=0cf0d31c313a366e3f272f830bdb4f2a7308e11f;p=sfa.git diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py old mode 100755 new mode 100644 index ccb14009..3ec03506 --- a/sfa/util/sfalogging.py +++ b/sfa/util/sfalogging.py @@ -1,47 +1,95 @@ #!/usr/bin/python -import os +import os, sys import traceback import logging, logging.handlers -class SfaLogging: - def __init__ (self,logfile,name=None,level=logging.INFO): - # default is to locate logger name from the logfile - if not name: - name=os.path.basename(logfile) - self.logger=logging.getLogger(name) - self.logger.setLevel(level) +CRITICAL=logging.CRITICAL +ERROR=logging.ERROR +WARNING=logging.WARNING +INFO=logging.INFO +DEBUG=logging.DEBUG + +# a logger that can handle tracebacks +class _SfaLogger: + def __init__ (self,logfile=None,loggername=None,level=logging.INFO): + # default is to locate loggername from the logfile if avail. + if not logfile: + #loggername='console' + #handler=logging.StreamHandler() + #handler.setFormatter(logging.Formatter("%(levelname)s %(message)s")) + logfile = "/var/log/sfa.log" + + if not loggername: + loggername=os.path.basename(logfile) try: handler=logging.handlers.RotatingFileHandler(logfile,maxBytes=1000000, backupCount=5) except IOError: # This is usually a permissions error becaue the file is # owned by root, but httpd is trying to access it. tmplogfile=os.getenv("TMPDIR", "/tmp") + os.path.sep + os.path.basename(logfile) + # In strange uses, 2 users on same machine might use same code, + # meaning they would clobber each others files + # We could (a) rename the tmplogfile, or (b) + # just log to the console in that case. + # Here we default to the console. + if os.path.exists(tmplogfile) and not os.access(tmplogfile,os.W_OK): + loggername = loggername + "-console" + handler = logging.StreamHandler() handler=logging.handlers.RotatingFileHandler(tmplogfile,maxBytes=1000000, backupCount=5) handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")) - self.logger.addHandler(handler) + self.logger=logging.getLogger(loggername) + self.logger.setLevel(level) + # check if logger already has the handler we're about to add + handler_exists = False + for l_handler in self.logger.handlers: + if l_handler.baseFilename == handler.baseFilename and \ + l_handler.level == handler.level: + handler_exists = True - def wrap(fun): - def wrapped(self,msg,*args,**kwds): - native=getattr(self.logger,fun.__name__) - return native(msg,*args,**kwds) - #wrapped.__doc__=native.__doc__ - return wrapped + if not handler_exists: + self.logger.addHandler(handler) + + self.loggername=loggername def setLevel(self,level): self.logger.setLevel(level) - @wrap - def critical(): pass - @wrap - def error(): pass - @wrap - def warning(): pass - @wrap - def info(): pass - @wrap - def debug(): pass - + # shorthand to avoid having to import logging all over the place + def setLevelDebug(self): + self.logger.setLevel(logging.DEBUG) + + # define a verbose option with s/t like + # parser.add_option("-v", "--verbose", action="count", dest="verbose", default=0) + # and pass the coresponding options.verbose to this method to adjust level + def setLevelFromOptVerbose(self,verbose): + if verbose==0: + self.logger.setLevel(logging.WARNING) + elif verbose==1: + self.logger.setLevel(logging.INFO) + elif verbose==2: + self.logger.setLevel(logging.DEBUG) + + #################### + def info(self, msg): + self.logger.info(msg) + + def debug(self, msg): + self.logger.debug(msg) + + def warn(self, msg): + self.logger.warn(msg) + + # some code is using logger.warn(), some is using logger.warning() + def warning(self, msg): + self.logger.warning(msg) + + def error(self, msg): + self.logger.error(msg) + + def critical(self, msg): + self.logger.critical(msg) + # logs an exception - use in an except statement def log_exc(self,message): self.error("%s BEG TRACEBACK"%message+"\n"+traceback.format_exc().strip("\n")) @@ -57,57 +105,67 @@ class SfaLogging: self.debug("%s BEG STACK"%message+"\n"+to_log) self.debug("%s END STACK"%message) -sfa_logger=SfaLogging(logfile='/var/log/sfa.log') -sfa_import_logger=SfaLogging(logfile='/var/log/sfa_import.log') + def enable_console(self, stream=sys.stdout): + formatter = logging.Formatter("%(message)s") + handler = logging.StreamHandler(stream) + handler.setFormatter(formatter) + self.logger.addHandler(handler) +info_logger = _SfaLogger(loggername='info', level=logging.INFO) +debug_logger = _SfaLogger(loggername='debug', level=logging.DEBUG) +warn_logger = _SfaLogger(loggername='warning', level=logging.WARNING) +error_logger = _SfaLogger(loggername='error', level=logging.ERROR) +critical_logger = _SfaLogger(loggername='critical', level=logging.CRITICAL) +logger = info_logger +sfi_logger = _SfaLogger(logfile=os.path.expanduser("~/.sfi/")+'sfi.log',loggername='sfilog', level=logging.DEBUG) ######################################## import time -def profile(callable): +def profile(logger): """ Prints the runtime of the specified callable. Use as a decorator, e.g., - - @profile - def foo(...): - ... - - Or, equivalently, - - def foo(...): - ... - foo = profile(foo) - - Or inline: - - result = profile(foo)(...) + + @profile(logger) + def foo(...): + ... """ + def logger_profile(callable): + def wrapper(*args, **kwds): + start = time.time() + result = callable(*args, **kwds) + end = time.time() + args = map(str, args) + args += ["%s = %s" % (name, str(value)) for (name, value) in kwds.iteritems()] + # should probably use debug, but then debug is not always enabled + logger.info("PROFILED %s (%s): %.02f s" % (callable.__name__, ", ".join(args), end - start)) + return result + return wrapper + return logger_profile - def wrapper(*args, **kwds): - start = time.time() - result = callable(*args, **kwds) - end = time.time() - args = map(str, args) - args += ["%s = %s" % (name, str(value)) for (name, value) in kwds.items()] - sfa_logger.debug("%s (%s): %.02f s" % (callable.__name__, ", ".join(args), end - start)) - return result - - return wrapper if __name__ == '__main__': print 'testing sfalogging into logger.log' - global sfa_logger - sfa_logger=SfaLogging('logger.log') - sfa_logger.critical("logger.critical") - sfa_logger.error("logger.error") - sfa_logger.warning("logger.warning") - sfa_logger.info("logger.info") - sfa_logger.debug("logger.debug") - sfa_logger.setLevel(logging.DEBUG) - sfa_logger.debug("logger.debug again") - - @profile + logger=_SfaLogger('logger.log') + logger2=_SfaLogger('logger.log', level=logging.DEBUG) + logger3=_SfaLogger('logger.log', level=logging.ERROR) + print logger.logger.handlers + + logger.critical("logger.critical") + logger.error("logger.error") + logger.warn("logger.warning") + logger.info("logger.info") + logger.debug("logger.debug") + logger.setLevel(logging.DEBUG) + logger.debug("logger.debug again") + + + @profile(logger) def sleep(seconds = 1): time.sleep(seconds) - sleep(1) + logger.info('console.info') + sleep(0.5) + logger.setLevel(logging.DEBUG) + sleep(0.25) +