mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: knotty: Remove dependency on format variable

Browse Source 
Passing around the log formatter variable was unnecessary since the log
levels of interest can be accesses as class members of
bb.msg.BBLogFormatter. Switching to do this will make using the
structured python logging much easier, since it can be difficult to
extract out the formatter for a specific handler.

(Bitbake rev: c1c867df24b4ef204027d485acac7c75c63f2bc0)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2020-03-09 11:33:47 -05:00
committed by Richard Purdie
parent 6b9eacb404
commit 300fd2a659
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitbake/lib/bb/tinfoil.py
View File

@@ -735,11 +735,9 @@ class Tinfoil:
console = handler console = handler
elif handler.stream == sys.stderr: elif handler.stream == sys.stderr:
errconsole = handler errconsole = handler
format_str = "%(levelname)s: %(message)s"
format = bb.msg.BBLogFormatter(format_str)
helper.shutdown = 0 helper.shutdown = 0
parseprogress = None parseprogress = None
termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, format, quiet=self.quiet) termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet)
try: try:
while True: while True:
try: try:

32
bitbake/lib/bb/ui/knotty.py
View File

@@ -109,12 +109,11 @@ def pluralise(singular, plural, qty):
class InteractConsoleLogFilter(logging.Filter): class InteractConsoleLogFilter(logging.Filter):
def __init__(self, tf, format): def __init__(self, tf):
self.tf = tf self.tf = tf
self.format = format
def filter(self, record): def filter(self, record):
if record.levelno == self.format.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): if record.levelno == bb.msg.BBLogFormatter.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")):
return False return False
self.tf.clearFooter() self.tf.clearFooter()
return True return True
@@ -150,7 +149,7 @@ class TerminalFilter(object):
cr = (25, 80) cr = (25, 80)
return cr return cr
def __init__(self, main, helper, console, errconsole, format, quiet): def __init__(self, main, helper, console, errconsole, quiet):
self.main = main self.main = main
self.helper = helper self.helper = helper
self.cuu = None self.cuu = None
@@ -180,7 +179,16 @@ class TerminalFilter(object):
termios.tcsetattr(fd, termios.TCSADRAIN, new) termios.tcsetattr(fd, termios.TCSADRAIN, new)
curses.setupterm() curses.setupterm()
if curses.tigetnum("colors") > 2: if curses.tigetnum("colors") > 2:
format.enable_color() if console:
try:
console.formatter.enable_color()
except AttributeError:
pass
if errconsole:
try:
errconsole.formatter.enable_color()
except AttributeError:
pass
self.ed = curses.tigetstr("ed") self.ed = curses.tigetstr("ed")
if self.ed: if self.ed:
self.cuu = curses.tigetstr("cuu") self.cuu = curses.tigetstr("cuu")
@@ -197,9 +205,9 @@ class TerminalFilter(object):
bb.note("Unable to use interactive mode for this terminal, using fallback") bb.note("Unable to use interactive mode for this terminal, using fallback")
return return
if console: if console:
console.addFilter(InteractConsoleLogFilter(self, format)) console.addFilter(InteractConsoleLogFilter(self))
if errconsole: if errconsole:
errconsole.addFilter(InteractConsoleLogFilter(self, format)) errconsole.addFilter(InteractConsoleLogFilter(self))
self.main_progress = None self.main_progress = None
@@ -469,7 +477,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
printinterval = 5000 printinterval = 5000
lastprint = time.time() lastprint = time.time()
termfilter = tf(main, helper, console, errconsole, format, params.options.quiet) termfilter = tf(main, helper, console, errconsole, params.options.quiet)
atexit.register(termfilter.finish) atexit.register(termfilter.finish)
while True: while True:
@@ -508,21 +516,21 @@ def main(server, eventHandler, params, tf = TerminalFilter):
if isinstance(event, logging.LogRecord): if isinstance(event, logging.LogRecord):
lastprint = time.time() lastprint = time.time()
printinterval = 5000 printinterval = 5000
if event.levelno >= format.ERROR: if event.levelno >= bb.msg.BBLogFormatter.ERROR:
errors = errors + 1 errors = errors + 1
return_value = 1 return_value = 1
elif event.levelno == format.WARNING: elif event.levelno == bb.msg.BBLogFormatter.WARNING:
warnings = warnings + 1 warnings = warnings + 1
if event.taskpid != 0: if event.taskpid != 0:
# For "normal" logging conditions, don't show note logs from tasks # For "normal" logging conditions, don't show note logs from tasks
# but do show them if the user has changed the default log level to # but do show them if the user has changed the default log level to
# include verbose/debug messages # include verbose/debug messages
if event.levelno <= format.NOTE and (event.levelno < llevel or (event.levelno == format.NOTE and llevel != format.VERBOSE)): if event.levelno <= bb.msg.BBLogFormatter.NOTE and (event.levelno < llevel or (event.levelno == bb.msg.BBLogFormatter.NOTE and llevel != bb.msg.BBLogFormatter.VERBOSE)):
continue continue
# Prefix task messages with recipe/task # Prefix task messages with recipe/task
if event.taskpid in helper.pidmap and event.levelno != format.PLAIN: if event.taskpid in helper.pidmap and event.levelno != bb.msg.BBLogFormatter.PLAIN:
taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]] taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]]
event.msg = taskinfo['title'] + ': ' + event.msg event.msg = taskinfo['title'] + ': ' + event.msg
if hasattr(event, 'fn'): if hasattr(event, 'fn'):