linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix playground after change 32249

Browse Source 
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 <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2023-12-11 17:52:40 +01:00
parent 06bcf94fa2
commit ba3c64ddac
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frappy/playground.py
View File

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