From e40339694150f16dad44873e6e79a97541b2b8f2 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Mon, 11 Dec 2023 17:52:40 +0100 Subject: [PATCH] fix playground after change 32249 as modules are now stored on secnode instead of dispatcher Change-Id: Iccda3d97269693a893c06a4e094a9c1dbcf7df0b Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32746 Tested-by: Jenkins Automated Tests Reviewed-by: Enrico Faulhaber Reviewed-by: Markus Zolliker --- frappy/playground.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/frappy/playground.py b/frappy/playground.py index 2f9d873..e6b9fbb 100644 --- a/frappy/playground.py +++ b/frappy/playground.py @@ -70,8 +70,8 @@ class MainLogger: self.log = None self.console_handler = None mlzlog.setLoggerClass(mlzlog.MLZLogger) - assert self.log is None - self.log = mlzlog.log = mlzlog.MLZLogger('') + mlzlog.log = mlzlog.MLZLogger('') + self.log = mlzlog.log.getChild('') self.log.setLevel(mlzlog.DEBUG) self.log.addHandler(mlzlog.ColoredConsoleHandler()) self.log.handlers[0].setLevel(LOG_LEVELS['comlog']) @@ -87,15 +87,7 @@ class Dispatcher(dispatcher.Dispatcher): value = repr(pobj.readerror) else: value = pobj.value - logobj = self._modules.get(moduleobj.name, self) - # self.log.info('%s:%s %r', modulename, pname, value) - logobj.log.info('%s %r', pobj.name, value) - - def register_module(self, moduleobj, modulename, export=True): - self.log.info('registering %s', modulename) - super().register_module(moduleobj, modulename, export) - setattr(main, modulename, moduleobj) - self.get_module(modulename) + moduleobj.log.info('%s %r', pobj.name, value) logger = MainLogger() @@ -119,6 +111,10 @@ class Playground(Server): merged_cfg.pop('node', None) self.module_cfg = merged_cfg self._processCfg() + for modulename, moduleobj in self.secnode.modules.items(): + cls = type(moduleobj).__bases__[0] + moduleobj.log.info('created as %s.%s', cls.__module__, cls.__name__) + setattr(main, modulename, moduleobj) play = Playground()