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

Merge branch 'master' of gitlab.psi.ch:samenv/servicemanager

Browse Source
This commit is contained in:
zolliker
2023-09-11 08:36:27 +02:00
parent 008690fe84 b4d41a297d
commit b7ab2f4656
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
base.py
View File

@ -237,7 +237,10 @@ class ServiceManager:
for p in procs.get(ins, {}).get(service, []): for p in procs.get(ins, {}).get(service, []):
print_wait = True print_wait = True
for action in ('terminate', 'kill'): for action in ('terminate', 'kill'):
try:
getattr(p, action)() # p.terminate or p.kill getattr(p, action)() # p.terminate or p.kill
except psutil.NoSuchProcess:
continue # already killed
for i in range(10): # total 0.1 * 10 * 9 / 2 = 4.5 sec for i in range(10): # total 0.1 * 10 * 9 / 2 = 4.5 sec
try: try:
p.wait(0.1 * i) p.wait(0.1 * i)
@ -261,6 +264,8 @@ class ServiceManager:
def do_stop(self, ins, service=None, *args): def do_stop(self, ins, service=None, *args):
self.get_info() self.get_info()
if ins is None:
raise ValueError('use stop all if you really want to stop all')
ins_list = self.wildcard(ins) ins_list = self.wildcard(ins)
if ins_list is not None: if ins_list is not None:
return ins_list return ins_list