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

use general config file instead of SECOP_CONF

Browse Source 
for getting the config directories
This commit is contained in:
zolliker 2022-04-13 11:48:17 +02:00
parent f411460c2c
commit 192bdca648
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frappyman.py
View File

@ -47,7 +47,10 @@ class FrappyManager(ServiceManager):
def config_dirs(self, ins, service): def config_dirs(self, ins, service):
cfgpaths = [] cfgpaths = []
for cfgpath in self.env[ins].get('SECOP_CONFDIR', '').split(os.pathsep): cfgparser = ConfigParser()
cfgparser.optionxform = str
cfgparser.read(self.env[ins]['FRAPPY_CONFIG_FILE'])
for cfgpath in cfgparser['confdir'].split(os.pathsep):
if cfgpath.endswith('SERV'): if cfgpath.endswith('SERV'):
cfgpaths.append(cfgpath[:-4] + service) cfgpaths.append(cfgpath[:-4] + service)
else: else:
@ -58,16 +61,13 @@ class FrappyManager(ServiceManager):
return cfgpaths return cfgpaths
def prepare_start(self, ins, service, cfg=''): def prepare_start(self, ins, service, cfg=''):
import os
import sys
start_dir, env = super().prepare_start(ins, service) start_dir, env = super().prepare_start(ins, service)
his = env.get('FRAPPY_HISTORY') his = env.get('FRAPPY_HISTORY')
if his: if his:
env['FRAPPY_HISTORY'] = his.replace('_SERVICE', '_' + service) env['FRAPPY_HISTORY'] = his.replace('_SERVICE', '_' + service)
cfgpaths = self.config_dirs(ins, service) cfgpaths = self.config_dirs(ins, service)
if cfgpaths: if cfgpaths:
env['SECOP_CONFDIR'] = os.pathsep.join(cfgpaths) env['FRAPPY_CONFDIR'] = os.pathsep.join(cfgpaths)
return start_dir, env return start_dir, env
def do_start(self, ins, service=None, cfg='', restart=False, wait=False, logger=None): def do_start(self, ins, service=None, cfg='', restart=False, wait=False, logger=None):