From a8dcdec00ff1e3453c1a86589f3897c8544682c8 Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Fri, 15 Mar 2024 09:25:38 -0500 Subject: [PATCH] tweak logger formatter to suppor OMNIPERF_COLOR=2 which includes the loglevel name in output, but without color Signed-off-by: Karl W Schulz [ROCm/rocprofiler-compute commit: 69de978d35884e4c40f2705a52a20f045eef71c5] --- projects/rocprofiler-compute/src/utils/logger.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/projects/rocprofiler-compute/src/utils/logger.py b/projects/rocprofiler-compute/src/utils/logger.py index 37b9c3229c..05bec4c18b 100644 --- a/projects/rocprofiler-compute/src/utils/logger.py +++ b/projects/rocprofiler-compute/src/utils/logger.py @@ -55,7 +55,7 @@ class ColoredFormatter(logging.Formatter): class PlainFormatter(logging.Formatter): def format(self, record): if record.levelno == logging.ERROR: - self._style._fmt = "%(levelname)s: %(message)s" + self._style._fmt = "%(levelname)s %(message)s" else: self._style._fmt = "%(message)s" return logging.Formatter.format(self, record) @@ -64,15 +64,19 @@ class PlainFormatter(logging.Formatter): # Setup console handler - provided as separate function to be called # prior to argument parsing def setup_console_handler(): - color = False + color_setting = 0 if "OMNIPERF_COLOR" in os.environ.keys(): - if os.environ["OMNIPERF_COLOR"] == "1": - color = True + color_setting = int(os.environ["OMNIPERF_COLOR"]) - if color: + if color_setting == 1: + # colored levelname formatter = ColoredFormatter("%(levelname)16s %(message)s") + elif color_setting == 2: + # non-colored levelname + formatter = logging.Formatter("%(levelname)5s %(message)s") else: + # non-colored formatter = PlainFormatter() console_handler = logging.StreamHandler(sys.stdout)