Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add try catch around process kill

Browse Source
This commit is contained in:
Andrew 2022-04-12 21:52:53 -04:00
parent 3711c94ffe
commit ed60e55ffe
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/classes/shared/server.py
View File

@ -9,6 +9,7 @@ import subprocess
import html import html
import tempfile import tempfile
import psutil import psutil
from psutil import NoSuchProcess
# TZLocal is set as a hidden import on win pipeline # TZLocal is set as a hidden import on win pipeline
from tzlocal import get_localzone from tzlocal import get_localzone
@ -670,8 +671,11 @@ class Server:
def kill(self): def kill(self):
logger.info(f"Terminating server {self.server_id} and all child processes") logger.info(f"Terminating server {self.server_id} and all child processes")
try:
process = psutil.Process(self.process.pid) process = psutil.Process(self.process.pid)
except NoSuchProcess:
logger.info(f"Cannot kill {self.process.pid} as we cannot find that pid.")
return
# for every sub process... # for every sub process...
for proc in process.children(recursive=True): for proc in process.children(recursive=True):
# kill all the child processes # kill all the child processes