core: move module handling out of dispatcher
Split module handling code from the dispatcher. The new class for managing Modules is called SecNode. * change logging to no longer need a reference to modobj * modules get a reference to the secnode obj instead of the dispatcher * intermediate usage fixes for frappy_psi/sea Change-Id: Ifee4bb47aa7a4508bb4a47c9a5873b7e2d5faf67 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32249 Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de> Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
This commit is contained in:
@ -29,11 +29,24 @@ import frappy.logging
|
||||
from frappy.logging import logger, generalConfig, HasComlog
|
||||
|
||||
|
||||
class SecNodeStub:
|
||||
def __init__(self):
|
||||
self.modules = {}
|
||||
self.name = ""
|
||||
|
||||
def add_module(self, module, modname):
|
||||
self.modules[modname] = module
|
||||
|
||||
def get_module(self, modname):
|
||||
return self.modules[modname]
|
||||
|
||||
|
||||
class ServerStub:
|
||||
restart = None
|
||||
shutdown = None
|
||||
|
||||
def __init__(self):
|
||||
self.secnode = SecNodeStub()
|
||||
self.dispatcher = Dispatcher('', logger.log.getChild('dispatcher'), {}, self)
|
||||
|
||||
|
||||
@ -98,7 +111,7 @@ def init_(monkeypatch):
|
||||
def __init__(self, name, srv, **kwds):
|
||||
kwds['description'] = ''
|
||||
super().__init__(name or 'mod', logger.log.getChild(name), kwds, srv)
|
||||
srv.dispatcher.register_module(self, name, name)
|
||||
srv.secnode.add_module(self, name)
|
||||
self.result[:] = []
|
||||
|
||||
def earlyInit(self):
|
||||
|
Reference in New Issue
Block a user