<div>Add bold color output to log level name and standard color output to log msg</div><div>when bitbake is run from an iteractive console. Color output is only enabled</div><div>if the terminal supports colors.</div><div>
---</div><div> lib/bb/msg.py | 40 ++++++++++++++++++++++++++++++++++++++++</div><div> lib/bb/ui/knotty.py | 6 +++++-</div><div> 2 files changed, 45 insertions(+), 1 deletions(-)</div><div><br></div><div>diff --git a/lib/bb/msg.py b/lib/bb/msg.py</div>
<div>index 9b39325..51e335b 100644</div><div>--- a/lib/bb/msg.py</div><div>+++ b/lib/bb/msg.py</div><div>@@ -55,6 +55,25 @@ class BBLogFormatter(logging.Formatter):</div><div> CRITICAL: 'ERROR',</div><div>
}</div><div> </div><div>+ color_enabled = False</div><div>+ BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(30,38)</div><div>+</div><div>+ COLORS = {</div><div>+ DEBUG3 : CYAN,</div><div>
+ DEBUG2 : CYAN,</div><div>+ DEBUG : CYAN,</div><div>+ VERBOSE : WHITE,</div><div>+ NOTE : WHITE,</div><div>+ PLAIN : WHITE,</div><div>+ WARNING : YELLOW,</div><div>+ ERROR : RED,</div>
<div>+ CRITICAL: RED,</div><div>+ }</div><div>+ </div><div>+ BLD = '\033[1;%dm'</div><div>+ STD = '\033[%dm'</div><div>+ RST = '\033[0m'</div><div>+</div><div> def getLevelName(self, levelno):</div>
<div> try:</div><div> return self.levelnames[levelno]</div><div>@@ -67,6 +86,8 @@ class BBLogFormatter(logging.Formatter):</div><div> if record.levelno == self.PLAIN:</div><div> msg = record.getMessage()</div>
<div> else:</div><div>+ if self.color_enabled:</div><div>+ self.colorize(record)</div><div> msg = logging.Formatter.format(self, record)</div><div> </div><div> if hasattr(record, 'bb_exc_info'):</div>
<div>@@ -75,6 +96,25 @@ class BBLogFormatter(logging.Formatter):</div><div> msg += '\n' + ''.join(formatted)</div><div> return msg</div><div> </div><div>+ def colorize(self, record):</div>
<div>+ color = self.COLORS[record.levelno]</div><div>+ if color is not None:</div><div>+ record.levelname = "".join([self.BLD % color, record.levelname, self.RST])</div><div>+ record.msg = "".join([self.STD % color, record.msg, self.RST])</div>
<div>+</div><div>+ def enable_color(self):</div><div>+ import curses</div><div>+ try:</div><div>+ win = None</div><div>+ win = curses.initscr()</div><div>+ if curses.has_colors():</div>
<div>+ self.color_enabled = True</div><div>+ except:</div><div>+ pass</div><div>+ finally:</div><div>+ if win is not None:</div><div>+ curses.endwin()</div>
<div>+</div><div> class BBLogFilter(object):</div><div> def __init__(self, handler, level, debug_domains):</div><div> self.stdlevel = level</div><div>diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py</div>
<div>index 9f51823..a6f29a9 100644</div><div>--- a/lib/bb/ui/knotty.py</div><div>+++ b/lib/bb/ui/knotty.py</div><div>@@ -114,12 +114,16 @@ def main(server, eventHandler, tf = TerminalFilter):</div><div> helper = uihelper.BBUIHelper()</div>
<div> </div><div> console = logging.StreamHandler(sys.stdout)</div><div>- format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")</div><div>+ format_str = "%(levelname)s: %(message)s"</div>
<div>+ format = bb.msg.BBLogFormatter(format_str)</div><div>+ if interactive:</div><div>+ format.enable_color()</div><div> bb.msg.addDefaultlogFilter(console)</div><div> console.setFormatter(format)</div>
<div> logger.addHandler(console)</div><div> if consolelogfile:</div><div> bb.utils.mkdirhier(os.path.dirname(consolelogfile))</div><div>+ format = bb.msg.BBLogFormatter(format_str)</div><div> consolelog = logging.FileHandler(consolelogfile)</div>
<div> bb.msg.addDefaultlogFilter(consolelog)</div><div> consolelog.setFormatter(format)</div><div>-- </div><div>1.7.2.5</div>