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 <g.brandl@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
This commit is contained in:
Alexander Zaft 2024-08-02 07:37:31 +02:00 committed by Markus Zolliker
parent 6f465be567
commit ff772e578e

View File

@ -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)