some more cosmetic changes
- fix an intend - add TODO: remove pkg - add .before_bott_at to backup of seastatus.tcl
This commit is contained in:
parent
95a3ff4ffd
commit
8b13e32ed7
1
base.py
1
base.py
@ -339,6 +339,7 @@ class ServiceManager:
|
||||
services = to_start
|
||||
for service_i in services:
|
||||
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)
|
||||
if opts:
|
||||
cmd = f'{cmd} {opts}'
|
||||
|
@ -138,9 +138,9 @@ class FrappyManager(ServiceManager):
|
||||
start_dir, env = super().prepare_start(ins, service)
|
||||
env_update = {}
|
||||
for key, value in env.items():
|
||||
if '<SERV>' in value:
|
||||
env_update[key] = value.replace('<SERV>', service)
|
||||
os.environ[key] = env[key]
|
||||
if '<SERV>' in value:
|
||||
env_update[key] = value.replace('<SERV>', service)
|
||||
os.environ[key] = env[key]
|
||||
cfgpaths = self.config_dirs(ins, service)
|
||||
if 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):
|
||||
proposed_cfg['addons'] = {','.join(proposed_addons)}
|
||||
|
||||
self._debug = {}
|
||||
for service in FrappyManager.services:
|
||||
given = givencfgs.get(service)
|
||||
running = self.frappy_cfgs.get(service)
|
||||
@ -413,8 +412,6 @@ class FrappyManager(ServiceManager):
|
||||
if 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):
|
||||
# we get here when the sea server is running and either at least one of:
|
||||
# - the sea config is matching any frappy cfg
|
||||
|
@ -117,7 +117,7 @@ class SeaManager(ServiceManager):
|
||||
seastatus = self.get_status_filename(ins)
|
||||
if seastatus:
|
||||
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):
|
||||
os.system(f'cp {seastatus} {dst}')
|
||||
return start_dir, env
|
||||
|
Loading…
x
Reference in New Issue
Block a user