From 43cac2212b9e330c527fc0003f400dd3e6276e61 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 11 Jul 2012 20:36:32 +0200 Subject: [PATCH] Fix for a case when ColorizingStreamHandler is not used --- lib/core/common.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index adfa4072f..0852014fd 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -696,15 +696,14 @@ def singleTimeLogMessage(message, level=logging.INFO, flag=None): logger.log(level, message) def setColor(message, bold=False): - message = "[TRAFFIC IN] " + message + retVal = message level = extractRegexResult(r"\A\s*\[(?P[A-Z ]+)\]", message) - _ = LOGGER_HANDLER.level_map.get(logging._levelNames.get(level)) - if _: - background, foreground, bold = _ - retVal = colored(message, color=foreground, on_color="on_%s" % background if background else None, attrs=("bold",) if bold else None) - else: - retVal = message + if hasattr(LOGGER_HANDLER, "level_map"): + _ = LOGGER_HANDLER.level_map.get(logging._levelNames.get(level)) + if _: + background, foreground, bold = _ + retVal = colored(message, color=foreground, on_color="on_%s" % background if background else None, attrs=("bold",) if bold else None) return retVal