diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-07 14:49:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-10 22:44:55 +0000 |
| commit | 8e1f6bfe1ef508a61ea38a2dd922684adb6efcaf (patch) | |
| tree | b2b5da6515a9a7f7d353d62cc684686718b7ec8f | |
| parent | 2cce5bd9dd93321ad159454d49760254c10a9ff6 (diff) | |
| download | bitbake-8e1f6bfe1ef508a61ea38a2dd922684adb6efcaf.tar.gz | |
bitbake/msg: Ensure lower level debug messages have DEBUG prefix and reuse log level values from formatter
(From Poky rev: 7586adb360d8075d3e97184dfcafb1b13ce5f838)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/msg.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 9d26fa06b..1f9ff904a 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -33,6 +33,8 @@ import bb.event class BBLogFormatter(logging.Formatter): """Formatter which ensures that our 'plain' messages (logging.INFO + 1) are used as is""" + DEBUG3 = logging.DEBUG - 2 + DEBUG2 = logging.DEBUG - 1 DEBUG = logging.DEBUG VERBOSE = logging.INFO - 1 NOTE = logging.INFO @@ -42,10 +44,12 @@ class BBLogFormatter(logging.Formatter): CRITICAL = logging.CRITICAL levelnames = { + DEBUG3 : 'DEBUG', + DEBUG2 : 'DEBUG', DEBUG : 'DEBUG', - PLAIN : '', - NOTE : 'NOTE', VERBOSE: 'NOTE', + NOTE : 'NOTE', + PLAIN : '', WARNING : 'WARNING', ERROR : 'ERROR', CRITICAL: 'ERROR', @@ -60,7 +64,7 @@ class BBLogFormatter(logging.Formatter): def format(self, record): record.levelname = self.getLevelName(record.levelno) - if record.levelno == logging.INFO + 1: + if record.levelno == self.PLAIN: return record.getMessage() else: return logging.Formatter.format(self, record) @@ -123,9 +127,9 @@ def get_debug_level(msgdomain = domain.Default): def set_verbose(level): if level: - logger.setLevel(logging.INFO - 1) + logger.setLevel(BBLogFormatter.VERBOSE) else: - logger.setLevel(logging.INFO) + logger.setLevel(BBLogFormatter.INFO) def set_debug_domains(domainargs): for (domainarg, iterator) in groupby(domainargs): |