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

allow a configfile path as single argument to secop-server

Browse Source 
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 <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2022-04-22 16:10:29 +02:00
parent a379805e43
commit cb170bd73b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secop/server.py
View File

@ -89,9 +89,11 @@ class Server:
""" """
self._testonly = testonly self._testonly = testonly
self.log = parent_logger.getChild(name, True)
if not cfgfiles: if not cfgfiles:
cfgfiles = name 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() merged_cfg = OrderedDict()
ambiguous_sections = set() ambiguous_sections = set()
for cfgfile in cfgfiles.split(','): for cfgfile in cfgfiles.split(','):