fix restart without cfg

restart did not work when no cfg was given and process was
in zombie state

+ fix restart 'all'
This commit is contained in:
l_samenv
2022-12-22 16:36:47 +01:00
parent 91cf31dde5
commit 42125b9887
2 changed files with 21 additions and 7 deletions

View File

@ -94,6 +94,15 @@ class FrappyManager(ServiceManager):
raise UsageError('need service to start (one of %s)' % ', '.join(self.services))
super().do_start(ins, service, cfg, restart, wait, logger)
def do_restart(self, ins, service=None, cfg=None, logger=None):
ins_list = super().do_restart(ins, service, cfg, logger)
if ins_list: # wildcard used
# determine running processes with cfg
cfginfo = {}
self.get_procs(None, cfginfo)
cfgs = {i for i, s in cfginfo if s == service or service is None}
return [i for i in ins_list if i in cfgs]
def check_server(self, ins='', service='main'):
start_dir, env = self.prepare_start(ins, service)
sys.path.insert(0, start_dir)