From c25b9903170930553d472efba12da88a0cad7e1c Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Mon, 6 Apr 2026 20:30:10 -0700 Subject: [PATCH] Move out to own function make_formatter. Easier to reuse in application code, further custom handlers. --- voussoirkit/vlogging.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/voussoirkit/vlogging.py b/voussoirkit/vlogging.py index 36bd699..2a2ff23 100644 --- a/voussoirkit/vlogging.py +++ b/voussoirkit/vlogging.py @@ -54,14 +54,7 @@ def add_loud(log): def add_root_handler(level): handler = StreamHandler() - datefmt = '%Y-%m-%dT%H:%M:%S' - if level <= LOUD: - formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}.{lineno}:{message}', style='{', datefmt=datefmt) - elif level <= DEBUG: - formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}:{message}', style='{', datefmt=datefmt) - else: - formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}:{message}', style='{', datefmt=datefmt) - handler.setFormatter(formatter) + handler.setFormatter(make_formatter(level)) handler.setLevel(level) root.addHandler(handler) return handler @@ -222,3 +215,13 @@ def main_decorator(main): add_root_handler(level) return main(argv, *args, **kwargs) return wrapped + +def make_formatter(level): + datefmt = '%Y-%m-%dT%H:%M:%S' + if level <= LOUD: + formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}.{lineno}:{message}', style='{', datefmt=datefmt) + elif level <= DEBUG: + formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}:{message}', style='{', datefmt=datefmt) + else: + formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}:{message}', style='{', datefmt=datefmt) + return formatter