summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2012-04-05 14:25:10 +0000
committerMarko Kreen2012-04-05 14:25:10 +0000
commit9c003a0c65eec567fcd6bc29b93f7ef46f8b463f (patch)
tree21230c05ba93066a83a2410a0c935303469aae19
parent67348e3eb3797eda224666e52ce78a20432c3871 (diff)
parentbbc21dcd2bc999ef8a1c7b5bb51f671345f7d34e (diff)
Merge remote branch 'intgit/master'
-rw-r--r--python/skytools/skylog.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/python/skytools/skylog.py b/python/skytools/skylog.py
index 354ef916..85ca0c71 100644
--- a/python/skytools/skylog.py
+++ b/python/skytools/skylog.py
@@ -333,19 +333,24 @@ except ImportError:
def log(self, level, msg, *args, **kwargs):
msg, kwargs = self.process(msg, kwargs)
self.logger.log(level, msg, *args, **kwargs)
- def isEnabledFor(self, level):
- return self.logger.isEnabledFor(level)
# add missing aliases (that are in Logger class)
LoggerAdapter.fatal = LoggerAdapter.critical
LoggerAdapter.warn = LoggerAdapter.warning
class SkyLogger(LoggerAdapter):
- """Add trace level."""
+ def __init__(self, logger, extra):
+ LoggerAdapter.__init__(self, logger, extra)
+ self.name = logger.name
def trace(self, msg, *args, **kwargs):
+ """Log 'msg % args' with severity 'TRACE'."""
self.log(TRACE, msg, *args, **kwargs)
def addHandler(self, hdlr):
+ """Add the specified handler to this logger."""
self.logger.addHandler(hdlr)
+ def isEnabledFor(self, level):
+ """See if the underlying logger is enabled for the specified level."""
+ return self.logger.isEnabledFor(level)
def getLogger(name=None, **kwargs_extra):
"""Get logger with extra functionality.