From b3f3779adf63c0d970462a558a6205da1d30c0ed Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 11 Mar 2020 18:28:44 -0500 Subject: knotty: Add logging cleanup Adds code to close all loggers when bitbake exits. This prevents unclosed file ResourceWarnings. A form of this closing existed previously, but was removed in the new logging code. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 11 +++++++++++ lib/bb/ui/knotty.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 6259af037..05645739d 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -320,3 +320,14 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): # TODO: I don't think that setting the global log level should be necessary #if newlevel < bb.msg.loggerDefaultLogLevel: # bb.msg.loggerDefaultLogLevel = newlevel + +def cleanupLogging(): + # Iterate through all the handlers and close them if possible. Fixes + # 'Unclosed resource' warnings when bitbake exits, see + # https://bugs.python.org/issue23010 + handlers = set() + for logger_iter in logging.Logger.manager.loggerDict.keys(): + handlers.update(logging.getLogger(logger_iter).handlers) + + for h in handlers: + h.close() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 386f27876..695108a64 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -823,4 +823,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass + bb.msg.cleanupLogging() + return return_value -- cgit 1.2.3-korg