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

improve general config

Browse Source 
for easier configuration of multiple servers on the same machine,
FRAPPY_* env. variables are overriding the values from the
general config file

+ apply expanduser where approporiate

Change-Id: Icb73543402f5fb1b8a248a8b8d7fb470971492f4
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29351
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2022-09-22 08:29:53 +02:00
parent 1b9cac04b1
commit 0a28192c15
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
secop/lib/__init__.py
View File

@ -51,8 +51,17 @@ class GeneralConfig:
:param configfile: if present, keys and values from the [FRAPPY] section are read :param configfile: if present, keys and values from the [FRAPPY] section are read
if configfile is not given, it tries to guess the location of the configfile default values for 'piddir', 'logdir' and 'confdir' are guessed from the
or determine 'piddir', 'logdir', 'confdir' and 'basedir' from the environment. location of this source file and from sys.executable.
if configfile is not given, the general config file is determined by
the env. variable FRAPPY_CONFIG_FILE or <confdir>/generalConfig.cfg is used
if a configfile is given, the values from the FRAPPY section are
overriding above defaults
finally, the env. variables FRAPPY_PIDDIR, FRAPPY_LOGDIR and FRAPPY_CONFDIR
are overriding these values when given
""" """
cfg = {} cfg = {}
mandatory = 'piddir', 'logdir', 'confdir' mandatory = 'piddir', 'logdir', 'confdir'
@ -69,15 +78,19 @@ class GeneralConfig:
# running on installed system (typically with systemd) # running on installed system (typically with systemd)
cfg.update(piddir='/var/run/frappy', logdir='/var/log', confdir='/etc/frappy') cfg.update(piddir='/var/run/frappy', logdir='/var/log', confdir='/etc/frappy')
if configfile is None: if configfile is None:
configfile = environ.get('FRAPPY_CONFIG_FILE', configfile = environ.get('FRAPPY_CONFIG_FILE')
path.join(cfg['confdir'], 'generalConfig.cfg')) if configfile:
if configfile and path.exists(configfile): configfile = path.expanduser(configfile)
if not path.exists(configfile):
raise FileNotFoundError(configfile)
else:
configfile = path.join(cfg['confdir'], 'generalConfig.cfg')
if not path.exists(configfile):
configfile = None
if configfile:
parser = ConfigParser() parser = ConfigParser()
parser.optionxform = str parser.optionxform = str
parser.read([configfile]) parser.read([configfile])
# mandatory in a general config file:
cfg['logdir'] = cfg['piddir'] = None
cfg['confdir'] = path.dirname(configfile)
# only the FRAPPY section is relevant, other sections might be used by others # only the FRAPPY section is relevant, other sections might be used by others
for key, value in parser['FRAPPY'].items(): for key, value in parser['FRAPPY'].items():
if value.startswith('./'): if value.startswith('./'):
@ -85,14 +98,15 @@ class GeneralConfig:
else: else:
# expand ~ to username, also in path lists separated with ':' # expand ~ to username, also in path lists separated with ':'
cfg[key] = ':'.join(path.expanduser(v) for v in value.split(':')) cfg[key] = ':'.join(path.expanduser(v) for v in value.split(':'))
else: if cfg.get('confdir') is None:
for key in mandatory: cfg['confdir'] = path.dirname(configfile)
cfg[key] = environ.get('FRAPPY_%s' % key.upper(), cfg[key]) for key in mandatory:
cfg[key] = environ.get('FRAPPY_%s' % key.upper(), cfg.get(key))
missing_keys = [key for key in mandatory if cfg[key] is None] missing_keys = [key for key in mandatory if cfg[key] is None]
if missing_keys: if missing_keys:
if path.exists(configfile): if configfile:
raise KeyError('missing value for %s in %s' % (' and '.join(missing_keys), configfile)) raise KeyError('missing value for %s in %s' % (' and '.join(missing_keys), configfile))
raise FileNotFoundError(configfile) raise KeyError('missing %s' % ' and '.join('FRAPPY_%s' % k.upper() for k in missing_keys))
# this is not customizable # this is not customizable
cfg['basedir'] = repodir cfg['basedir'] = repodir
self._config = cfg self._config = cfg