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

do not fail when generalConfig.init() is called twice

Browse Source 
Change-Id: I7132b71f906fc8a77b6fedcdcc2c7d4a3e48830a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34818
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
zolliker 2024-10-16 15:10:15 +02:00
parent 72eb00fb27
commit f9f713811e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frappy/lib/__init__.py
View File

@ -76,18 +76,20 @@ class GeneralConfig:
if (Path(sys.executable).suffix == ".exe" if (Path(sys.executable).suffix == ".exe"
and not Path(sys.executable).name.startswith('python')): and not Path(sys.executable).name.startswith('python')):
# special MS windows environment # special MS windows environment
self.update_defaults(piddir=Path('./'), logdir=Path('./log'), confdir=Path('./')) confdir = Path('./')
self.update_defaults(piddir=Path('./'), logdir=Path('./log'))
elif path.exists(path.join(repodir, 'cfg')): elif path.exists(path.join(repodir, 'cfg')):
# running from git repo # running from git repo
self.set_default('confdir', repodir / 'cfg') confdir = repodir / 'cfg'
# take logdir and piddir from <repodir>/cfg/generalConfig.cfg # take logdir and piddir from <repodir>/cfg/generalConfig.cfg
else: else:
# running on installed system (typically with systemd) # running on installed system (typically with systemd)
self.update_defaults( self.update_defaults(
piddir=Path('/var/run/frappy'), piddir=Path('/var/run/frappy'),
logdir=Path('/var/log'), logdir=Path('/var/log'),
confdir=Path('/etc/frappy')
) )
confdir = Path('/etc/frappy')
self.set_default('confdir', confdir)
if configfile is None: if configfile is None:
configfile = environ.get('FRAPPY_CONFIG_FILE') configfile = environ.get('FRAPPY_CONFIG_FILE')
if configfile: if configfile:
@ -95,7 +97,7 @@ class GeneralConfig:
if not configfile.exists(): if not configfile.exists():
raise FileNotFoundError(configfile) raise FileNotFoundError(configfile)
else: else:
configfile = self['confdir'] / 'generalConfig.cfg' configfile = confdir / 'generalConfig.cfg'
if not configfile.exists(): if not configfile.exists():
configfile = None configfile = None
if configfile: if configfile: