From cb170bd73b8bb04be50682645c29ded16ff1cf97 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Fri, 22 Apr 2022 16:10:29 +0200 Subject: [PATCH] allow a configfile path as single argument to secop-server when a full path is given as single argument to secop-server, the server name has to be sanitized Change-Id: I1d11f076157548e90877f380f0cab3a6a3f96784 Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28232 Tested-by: Jenkins Automated Tests Reviewed-by: Markus Zolliker --- secop/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/secop/server.py b/secop/server.py index c96093a..c46a5e0 100644 --- a/secop/server.py +++ b/secop/server.py @@ -89,9 +89,11 @@ class Server: """ self._testonly = testonly - self.log = parent_logger.getChild(name, True) if not cfgfiles: 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) merged_cfg = OrderedDict() ambiguous_sections = set() for cfgfile in cfgfiles.split(','):