From 8f47cfa5bf94fa8c9a5c75991abf0af203cba104 Mon Sep 17 00:00:00 2001 From: Jan Musial Date: Thu, 9 Sep 2021 10:23:28 +0200 Subject: [PATCH] Make multiple pyocf loggers viable Signed-off-by: Jan Musial --- tests/functional/pyocf/types/logger.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/functional/pyocf/types/logger.py b/tests/functional/pyocf/types/logger.py index df7e963..6fddd14 100644 --- a/tests/functional/pyocf/types/logger.py +++ b/tests/functional/pyocf/types/logger.py @@ -20,9 +20,7 @@ import weakref from ..ocf import OcfLib -logger = logging.getLogger("pyocf") -logger.setLevel(logging.DEBUG) - +logging.basicConfig(level=logging.DEBUG, handlers=[logging.NullHandler()]) class LogLevel(IntEnum): EMERG = 0 @@ -71,7 +69,7 @@ class LoggerPriv(Structure): class Logger(Structure): _instances_ = weakref.WeakValueDictionary() - _fields_ = [("logger", c_void_p)] + _fields_ = [("_logger", c_void_p)] def __init__(self): self.ops = LoggerOps( @@ -118,23 +116,25 @@ class Logger(Structure): class DefaultLogger(Logger): - def __init__(self, level: LogLevel = LogLevel.WARN): + def __init__(self, level: LogLevel = LogLevel.WARN, name: str = ""): super().__init__() self.level = level + self.name = name + self.logger = logging.getLogger(name) ch = logging.StreamHandler() fmt = logging.Formatter( "%(asctime)s - %(name)s - %(levelname)s - %(message)s" ) ch.setFormatter(fmt) ch.setLevel(LevelMapping[level]) - logger.addHandler(ch) + self.logger.addHandler(ch) def log(self, lvl: int, msg: str): - logger.log(LevelMapping[lvl], msg) + self.logger.log(LevelMapping[lvl], msg) def close(self): - logger.handlers = [] + self.logger.handlers = [] class FileLogger(Logger):