[Pywikibot-commits] [Gerrit] ...core[master]: [bugfix] Do not print log header twice in log files

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/785882 ) Change subject: [bugfix] Do not print log header twice in log files ...................................................................... [bugfix] Do not print log header twice in log files Bug: T264235 Change-Id: If239015d9978e1edc013f319d90a692f69b79f4e --- M pywikibot/bot.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index c5fd565..5183905 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -293,12 +293,12 @@ pywikibot.argvu = ui.argvu() # re-initialize - if _handlers_initialized: + _handlers_initialized.clear() init_handlers() -_handlers_initialized = False +_handlers_initialized = [] # we can have a script and the script wrapper def handler_namer(name: str) -> str: @@ -355,8 +355,6 @@ Different logfiles are used if multiple processes of the same script are running. """ - global _handlers_initialized - module_name = calledModuleName() if not module_name: module_name = 'terminal-interface' @@ -372,6 +370,8 @@ # for prompts requiring user response root_logger = logging.getLogger('pywiki') + if root_logger.hasHandlers() and module_name in _handlers_initialized: + return root_logger.setLevel(DEBUG + 1) # all records except DEBUG go to logger warnings_logger = logging.getLogger('py.warnings') @@ -387,7 +387,7 @@ warnings.filterwarnings('module') warnings.filterwarnings('once', category=FutureWarning) - root_logger.handlers = [] # remove any old handlers + root_logger.handlers.clear() # remove any old handlers root_logger.propagate = False # T281643 # configure handler(s) for display to user interface @@ -448,7 +448,7 @@ warnings_logger.addHandler(file_handler) - _handlers_initialized = True + _handlers_initialized.append(module_name) writelogheader() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/785882 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If239015d9978e1edc013f319d90a692f69b79f4e Gerrit-Change-Number: 785882 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged