mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Some improvements to process control, should fix GH-112

Browse Source
This commit is contained in:
krateng 2022-04-25 18:36:11 +02:00
parent 938947d06c
commit 9c656ee90b
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maloja/__main__.py
View File

@ -1,6 +1,7 @@
import os import os
import signal import signal
import subprocess import subprocess
import time
from setproctitle import setproctitle from setproctitle import setproctitle
from ipaddress import ip_address from ipaddress import ip_address
@ -40,9 +41,10 @@ def get_instance_supervisor():
return None return None
def restart(): def restart():
stop() if stop():
start() start()
else:
print(col["red"]("Could not stop Maloja!"))
def start(): def start():
if get_instance_supervisor() is not None: if get_instance_supervisor() is not None:
@ -69,17 +71,29 @@ def start():
def stop(): def stop():
pid_sv = get_instance_supervisor() for attempt in [(signal.SIGTERM,2),(signal.SIGTERM,5),(signal.SIGKILL,3),(signal.SIGKILL,5)]:
if pid_sv is not None:
os.kill(pid_sv,signal.SIGTERM)
pid_sv = get_instance_supervisor()
pid = get_instance() pid = get_instance()
if pid is not None:
os.kill(pid,signal.SIGTERM)
if pid is None and pid_sv is None: if pid is None and pid_sv is None:
print("Maloja stopped!")
return True
if pid_sv is not None:
os.kill(pid_sv,attempt[0])
if pid is not None:
os.kill(pid,attempt[0])
time.sleep(attempt[1])
return False return False
print("Maloja stopped!") print("Maloja stopped!")
return True return True