do not crash when process is already killed in the mean time

2023-08-25 16:58:53 +02:00 · 2023-08-25 16:58:53 +02:00 · 1c0ff3a121
commit 1c0ff3a121
parent a255b9b715
1 changed files with 4 additions and 1 deletions
--- a/base.py
+++ b/base.py
@ -237,7 +237,10 @@ class ServiceManager:
            for p in procs.get(ins, {}).get(service, []):
                print_wait = True
                for action in ('terminate', 'kill'):
+                    try:
                        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
                        try:
                            p.wait(0.1 * i)