Inject taskpid into log records via our log handler

It turns out that while log filters added with addFilter are only associated
with that logger, and not its children, handlers are inherited, and handlers
can be filters.   So, let's add filtering to our existing LogHandler class
which dispatches our log records as bitbake events.

Signed-off-by: Chris Larson <chris_larson@mentor.com>

2 files changed, 4 insertions, 8 deletions

diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
index ba5061e6f..572d5b31c 100644
--- a/lib/bb/__init__.py
+++ b/lib/bb/__init__.py
@@ -35,11 +35,6 @@ class NullHandler(logging.Handler):
     def emit(self, record):
         pass
 
-class BBLogRecord(logging.LogRecord):
-    def __init__(self, name, level, fn, lno, msg, args, exc_info, func, extra):
-        self.taskpid = bb.event.worker_pid
-        logging.LogRecord.__init__(self, name, level, fn, lno, msg, args, exc_info, func)
-
 Logger = logging.getLoggerClass()
 class BBLogger(Logger):
     def __init__(self, name):
@@ -47,9 +42,6 @@ class BBLogger(Logger):
             self.debug = self.bbdebug
         Logger.__init__(self, name)
 
-    def makeRecord(self, name, lvl, fn, lno, msg, args, exc_info, func=None, extra=None):
-        return BBLogRecord(name, lvl, fn, lno, msg, args, exc_info, func, extra)
-
     def bbdebug(self, level, msg, *args, **kwargs):
         return self.log(logging.DEBUG - level - 1, msg, *args, **kwargs)
 
diff --git a/lib/bb/event.py b/lib/bb/event.py
index 5a58aee67..c22a5910b 100644
--- a/lib/bb/event.py
+++ b/lib/bb/event.py
@@ -380,3 +380,7 @@ class LogHandler(logging.Handler):
 
     def emit(self, record):
         fire(record, None)
+
+    def filter(self, record):
+        record.taskpid = worker_pid
+        return True