From ff772e578e5a33f1277c60ef9c98a55b5c4827af Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Fri, 2 Aug 2024 07:37:31 +0200 Subject: [PATCH] pass logger parameter only for mlzlogger The mlzlogger has an extra argument we want to keep using. To keep compatibility, check if we got the mlzlogger or something else. Change-Id: I1a4f4e7651370dd71124ab7c3608c6573a585dd9 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34292 Reviewed-by: Georg Brandl Reviewed-by: Enrico Faulhaber Tested-by: Jenkins Automated Tests Reviewed-by: Alexander Zaft --- frappy/server.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappy/server.py b/frappy/server.py index bc1956e..0b1f4fb 100644 --- a/frappy/server.py +++ b/frappy/server.py @@ -27,6 +27,8 @@ import signal import sys import threading +import mlzlog + from frappy.config import load_config from frappy.errors import ConfigError from frappy.lib import formatException, generalConfig, get_class, mkthread @@ -94,7 +96,10 @@ class Server: cfgfiles = name # sanitize name (in case it is a cfgfile) name = os.path.splitext(os.path.basename(name))[0] - self.log = parent_logger.getChild(name, True) + if isinstance(parent_logger, mlzlog.MLZLogger): + self.log = parent_logger.getChild(name, True) + else: + self.log = parent_logger.getChild(name) init_remote_logging(self.log) merged_cfg = load_config(cfgfiles, self.log)