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

configurable search path for cfg files

Browse Source
This commit is contained in:
l_samenv 2020-09-08 12:13:17 +02:00
parent 5aff4b9dab
commit c1ffc160a2
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
secop/server.py
View File

@ -24,6 +24,7 @@
"""Define helpers""" """Define helpers"""
import os import os
from os.path import join, exists, dirname, isdir
import ast import ast
import time import time
import threading import threading
@ -93,11 +94,7 @@ class Server:
merged_cfg = OrderedDict() merged_cfg = OrderedDict()
ambiguous_sections = set() ambiguous_sections = set()
for cfgfile in cfgfiles.split(','): for cfgfile in cfgfiles.split(','):
if cfgfile.endswith('.cfg') and os.path.exists(cfgfile): cfgdict = self.loadCfgFile(cfgfile)
filename = cfgfile
else:
filename = os.path.join(cfg['confdir'], cfgfile + '.cfg')
cfgdict = self.loadCfgFile(filename)
ambiguous_sections |= set(merged_cfg) & set(cfgdict) ambiguous_sections |= set(merged_cfg) & set(cfgdict)
merged_cfg.update(cfgdict) merged_cfg.update(cfgdict)
self.node_cfg = merged_cfg.pop('NODE', {}) self.node_cfg = merged_cfg.pop('NODE', {})
@ -114,9 +111,22 @@ class Server:
if ambiguous_sections: if ambiguous_sections:
self.log.warning('ambiguous sections in %s: %r' % (cfgfiles, tuple(ambiguous_sections))) self.log.warning('ambiguous sections in %s: %r' % (cfgfiles, tuple(ambiguous_sections)))
self._cfgfiles = cfgfiles self._cfgfiles = cfgfiles
self._pidfile = os.path.join(cfg['piddir'], name + '.pid') self._pidfile = join(cfg['piddir'], name + '.pid')
def loadCfgFile(self, filename): def loadCfgFile(self, cfgfile):
if not cfgfile.endswith('.cfg'):
cfgfile += '.cfg'
if '/' in cfgfile: # specified as full path
filename = cfgfile if exists(cfgfile) else None
else:
cfg = getGeneralConfig()
for filename in [join(d, cfgfile) for d in cfg['confdir'].split(':')]:
if exists(filename):
break
else:
filename = None
if filename is None:
raise ConfigError("Couldn't find cfg file %r" % cfgfile)
self.log.debug('Parse config file %s ...' % filename) self.log.debug('Parse config file %s ...' % filename)
result = OrderedDict() result = OrderedDict()
parser = configparser.ConfigParser() parser = configparser.ConfigParser()
@ -154,8 +164,8 @@ class Server:
def start(self): def start(self):
if not DaemonContext: if not DaemonContext:
raise ConfigError('can not daemonize, as python-daemon is not installed') raise ConfigError('can not daemonize, as python-daemon is not installed')
piddir = os.path.dirname(self._pidfile) piddir = dirname(self._pidfile)
if not os.path.isdir(piddir): if not isdir(piddir):
os.makedirs(piddir) os.makedirs(piddir)
pidfile = pidlockfile.TimeoutPIDLockFile(self._pidfile) pidfile = pidlockfile.TimeoutPIDLockFile(self._pidfile)