From 69af2ffc833d749e82cee3205d1901c578728da7 Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Thu, 14 Mar 2024 17:26:47 -0500 Subject: [PATCH] update logging formatter handling for consistent behavior with error messsages Signed-off-by: Karl W Schulz --- src/utils/logger.py | 13 +++++++++++-- src/utils/utils.py | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/utils/logger.py b/src/utils/logger.py index 312b886250..2b2119508b 100644 --- a/src/utils/logger.py +++ b/src/utils/logger.py @@ -51,6 +51,15 @@ class ColoredFormatter(logging.Formatter): return logging.Formatter.format(self, record) +class PlainFormatter(logging.Formatter): + def format(self, record): + if record.levelno == logging.ERROR: + self._style._fmt = "%(levelname)s: %(message)s" + else: + self._style._fmt = "%(message)s" + return logging.Formatter.format(self, record) + + # Setup console handler - provided as separate function to be called # prior to argument parsing def setup_console_handler(): @@ -61,9 +70,9 @@ def setup_console_handler(): color = True if color: - formatter = ColoredFormatter("%(levelname)s %(message)s") + formatter = ColoredFormatter("%(levelname)16s %(message)s") else: - formatter = logging.Formatter("%(message)s") + formatter = PlainFormatter() console_handler = logging.StreamHandler(sys.stdout) console_handler.setFormatter(formatter) diff --git a/src/utils/utils.py b/src/utils/utils.py index f8e7861e6d..7a1b710f5c 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -51,9 +51,9 @@ def demarcate(function): def console_error(*argv, exit=True): if len(argv) > 1: - logging.error("ERROR: " + f"[{argv[0]}] {argv[1]}") + logging.error(f"[{argv[0]}] {argv[1]}") else: - logging.error("ERROR: " + f"{argv[0]}") + logging.error(f"{argv[0]}") if exit: sys.exit(1)