summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-17 11:49:31 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:52 +0000
commit760b82e7320ce5dbf295df6811b04bd0594fd516 (patch)
treeaf6cc359efc9380cde07d40e7c344a11c6cb60ea /bitbake/lib
parent93e20c51c4cbb345119b83a964409932af417df3 (diff)
downloadopenembedded-core-760b82e7320ce5dbf295df6811b04bd0594fd516.tar.gz
openembedded-core-760b82e7320ce5dbf295df6811b04bd0594fd516.tar.bz2
openembedded-core-760b82e7320ce5dbf295df6811b04bd0594fd516.tar.xz
openembedded-core-760b82e7320ce5dbf295df6811b04bd0594fd516.zip
Fix logging level names for post-server-ui-split
(Bitbake rev: dc5a5c39291ec223cd761dce59d29eee7316cb70) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/msg.py21
-rw-r--r--bitbake/lib/bb/ui/knotty.py10
2 files changed, 21 insertions, 10 deletions
diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index 36d7060b1..badc371ce 100644
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -33,7 +33,28 @@ import bb.event
class BBLogFormatter(logging.Formatter):
"""Formatter which ensures that our 'plain' messages (logging.INFO + 1) are used as is"""
+ VERBOSE = 19
+ PLAIN = 21
+ levelnames = {
+ PLAIN : '',
+ VERBOSE: 'NOTE',
+
+ logging.DEBUG : 'DEBUG',
+ logging.INFO : 'NOTE',
+ logging.WARNING : 'WARNING',
+ logging.ERROR : 'ERROR',
+ logging.CRITICAL: 'ERROR',
+ }
+
+ def getLevelName(self, levelno):
+ try:
+ return self.levelnames[levelno]
+ except KeyError:
+ self.levelnames[levelno] = value = 'Level %d' % levelno
+ return value
+
def format(self, record):
+ record.levelname = self.getLevelName(record.levelno)
if record.levelno == logging.INFO + 1:
return record.getMessage()
else:
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index b9ad34f16..cedbe4230 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -74,16 +74,6 @@ def main(server, eventHandler):
helper = uihelper.BBUIHelper()
- # Set up logging to stdout in our usual format
- logging.addLevelName(logging.INFO, "NOTE")
- logging.addLevelName(logging.CRITICAL, "FATAL")
-
- for level in xrange(logging.INFO - 1, logging.DEBUG + 1, -1):
- logging.addLevelName(level, logging.getLevelName(logging.INFO))
-
- for level in xrange(logging.DEBUG - 1, 0, -1):
- logging.addLevelName(level, logging.getLevelName(logging.DEBUG))
-
console = logging.StreamHandler(sys.stdout)
format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
console.setFormatter(format)