restored kb.currentMessage - needed in cases where we send to dataToStdout() strings like "." (e.g. "creation in progres ..... done")

bdamele · bdamele · commit 247f95e051d6 · 2012-07-11T22:48:27.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -697,10 +697,13 @@ def singleTimeLogMessage(message, level=logging.INFO, flag=None):
 
 def setColor(message, bold=False):
     retVal = message
-    level = extractRegexResult(r"\A\s*\[(?P<result>[A-Z ]+)\]", message)
+    level = extractRegexResult(r"\[(?P<result>[A-Z ]+)\]", message)
 
-    if hasattr(LOGGER_HANDLER, "level_map"):
-        _ = LOGGER_HANDLER.level_map.get(logging.getLevelName(level))
+    if level:
+        kb.currentMessage = level
+
+    if hasattr(LOGGER_HANDLER, "level_map") and hasattr(kb, "currentMessage") and kb.currentMessage:
+        _ = LOGGER_HANDLER.level_map.get(logging.getLevelName(kb.currentMessage))
         if _:
             background, foreground, bold = _
             retVal = colored(message, color=foreground, on_color="on_%s" % background if background else None, attrs=("bold",) if bold else None)
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1436,6 +1436,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
 
     kb.commonOutputs = None
     kb.counters = {}
+    kb.currentMessage = None
     kb.data = AttribDict()
     kb.dataOutputFlag = False
 
