bitbake: event/build: Drop stdout specific handling for python messages as this is no longer needed with newer log handling
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
af6480bdde
commit
fb9c5a196e
|
@ -304,11 +304,6 @@ def _exec_task(fn, task, d, quieterr):
|
|||
os.dup2(logfile.fileno(), oso[1])
|
||||
os.dup2(logfile.fileno(), ose[1])
|
||||
|
||||
# Since we've remapped stdout and stderr, its safe for log messages to be printed there now
|
||||
# exec_func can nest so we have to save state
|
||||
origstdout = bb.event.useStdout
|
||||
bb.event.useStdout = True
|
||||
|
||||
# Ensure python logging goes to the logfile
|
||||
handler = logging.StreamHandler(logfile)
|
||||
handler.setFormatter(logformatter)
|
||||
|
@ -334,8 +329,6 @@ def _exec_task(fn, task, d, quieterr):
|
|||
|
||||
bblogger.removeHandler(handler)
|
||||
|
||||
bb.event.useStdout = origstdout
|
||||
|
||||
# Restore the backup fds
|
||||
os.dup2(osi[0], osi[1])
|
||||
os.dup2(oso[0], oso[1])
|
||||
|
|
|
@ -36,7 +36,6 @@ import bb.utils
|
|||
# the runqueue forks off.
|
||||
worker_pid = 0
|
||||
worker_pipe = None
|
||||
useStdout = True
|
||||
|
||||
class Event(object):
|
||||
"""Base class for events"""
|
||||
|
@ -162,7 +161,6 @@ def remove(name, handler):
|
|||
def register_UIHhandler(handler):
|
||||
bb.event._ui_handler_seq = bb.event._ui_handler_seq + 1
|
||||
_ui_handlers[_ui_handler_seq] = handler
|
||||
bb.event.useStdout = False
|
||||
return _ui_handler_seq
|
||||
|
||||
def unregister_UIHhandler(handlerNum):
|
||||
|
@ -382,8 +380,6 @@ class LogHandler(logging.Handler):
|
|||
|
||||
def emit(self, record):
|
||||
fire(record, None)
|
||||
if bb.event.useStdout:
|
||||
print(self.format(record))
|
||||
|
||||
def filter(self, record):
|
||||
record.taskpid = worker_pid
|
||||
|
|
Loading…
Reference in New Issue