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

some more cosmetic changes

Browse Source 
- fix an intend
- add TODO: remove pkg
- add .before_bott_at to backup of seastatus.tcl
This commit is contained in:
zolliker 2024-06-27 15:37:59 +02:00
parent 95a3ff4ffd
commit 8b13e32ed7
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base.py
View File

@ -339,6 +339,7 @@ class ServiceManager:
services = to_start services = to_start
for service_i in services: for service_i in services:
port = service_ports[service_i] port = service_ports[service_i]
# TODO: remove unused pkg
cmd = self.commands[ins] % dict(ins=ins, serv=service_i, port=port, cfg=cfg, pkg=self.pkg or ins) cmd = self.commands[ins] % dict(ins=ins, serv=service_i, port=port, cfg=cfg, pkg=self.pkg or ins)
if opts: if opts:
cmd = f'{cmd} {opts}' cmd = f'{cmd} {opts}'

9
frappyman.py
View File

@ -138,9 +138,9 @@ class FrappyManager(ServiceManager):
start_dir, env = super().prepare_start(ins, service) start_dir, env = super().prepare_start(ins, service)
env_update = {} env_update = {}
for key, value in env.items(): for key, value in env.items():
if '<SERV>' in value: if '<SERV>' in value:
env_update[key] = value.replace('<SERV>', service) env_update[key] = value.replace('<SERV>', service)
os.environ[key] = env[key] os.environ[key] = env[key]
cfgpaths = self.config_dirs(ins, service) cfgpaths = self.config_dirs(ins, service)
if cfgpaths: if cfgpaths:
env_update['FRAPPY_CONFDIR'] = os.pathsep.join(cfgpaths) env_update['FRAPPY_CONFDIR'] = os.pathsep.join(cfgpaths)
@ -404,7 +404,6 @@ class FrappyManager(ServiceManager):
if proposed_addons: # and set(proposed_addons) != set(running_addons): if proposed_addons: # and set(proposed_addons) != set(running_addons):
proposed_cfg['addons'] = {','.join(proposed_addons)} proposed_cfg['addons'] = {','.join(proposed_addons)}
self._debug = {}
for service in FrappyManager.services: for service in FrappyManager.services:
given = givencfgs.get(service) given = givencfgs.get(service)
running = self.frappy_cfgs.get(service) running = self.frappy_cfgs.get(service)
@ -413,8 +412,6 @@ class FrappyManager(ServiceManager):
if running: if running:
self.state[f'frappy {service}'] = running self.state[f'frappy {service}'] = running
self._debug[service] = (seaconfig, available, running, running in self.frappy2sea)
if seaconfig and (available or running in self.frappy2sea): if seaconfig and (available or running in self.frappy2sea):
# we get here when the sea server is running and either at least one of: # we get here when the sea server is running and either at least one of:
# - the sea config is matching any frappy cfg # - the sea config is matching any frappy cfg

2
seaman.py
View File

@ -117,7 +117,7 @@ class SeaManager(ServiceManager):
seastatus = self.get_status_filename(ins) seastatus = self.get_status_filename(ins)
if seastatus: if seastatus:
boot_time = time.strftime("%Y-%m-%dT%H-%M-%S", time.localtime(psutil.boot_time())) boot_time = time.strftime("%Y-%m-%dT%H-%M-%S", time.localtime(psutil.boot_time()))
dst = seastatus.replace('.tcl', '') + '.' + boot_time dst = seastatus.replace('.tcl', '') + '.before_boot_at' + boot_time
if not exists(dst): if not exists(dst):
os.system(f'cp {seastatus} {dst}') os.system(f'cp {seastatus} {dst}')
return start_dir, env return start_dir, env