From b37e625df34627bfa7c3780857ace61f182f94de Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 19 Nov 2024 15:34:00 +0100 Subject: [PATCH] frappy.server: use server name for SecNode name no need to configure the name of SecNode and Dispatcher Change-Id: I5199bbd77c74e4fe56b527a5a565a8285b0d831e Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34988 Reviewed-by: Markus Zolliker Tested-by: Jenkins Automated Tests --- frappy/server.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappy/server.py b/frappy/server.py index 444087f..14ee89b 100644 --- a/frappy/server.py +++ b/frappy/server.py @@ -97,7 +97,7 @@ class Server: if not cfgfiles: cfgfiles = [name] # sanitize name (in case it is a cfgfile) - name = os.path.splitext(os.path.basename(name))[0] + self.name = name = os.path.splitext(os.path.basename(name))[0] if isinstance(parent_logger, mlzlog.MLZLogger): self.log = parent_logger.getChild(name, True) else: @@ -292,10 +292,9 @@ class Server: errors = [] opts = dict(self.node_cfg) cls = get_class(opts.pop('cls')) - name = opts.pop('name', '-'.join(self._cfgfiles)) # TODO: opts not in both - self.secnode = SecNode(name, self.log.getChild('secnode'), opts, self) - self.dispatcher = cls(name, self.log.getChild('dispatcher'), opts, self) + self.secnode = SecNode(self.name, self.log.getChild('secnode'), opts, self) + self.dispatcher = cls(self.name, self.log.getChild('dispatcher'), opts, self) # add other options as SECNode properties, those with '_' prefixed will # get exported