Fix logging level names for post-server-ui-split

Signed-off-by: Chris Larson <chris_larson@mentor.com>

2 files changed, 21 insertions, 10 deletions

diff --git a/lib/bb/msg.py b/lib/bb/msg.py
index 0c1fa3bfc..13ee569e9 100644
--- a/lib/bb/msg.py
+++ b/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/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index 0b47136cb..29c71aef2 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -72,16 +72,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, "ERROR")
-
-    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)