Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make auto reloader work on Mac (#1249)

Browse Source
This commit is contained in:
GaryO 2018-06-18 18:16:10 -04:00 committed by Raphael Deem
parent 5ff481952d
commit 01257f65a6
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sanic/reloader_helpers.py
View File

@ -55,9 +55,9 @@ def restart_with_reloader():
def kill_process_children_unix(pid): def kill_process_children_unix(pid):
"""Find and kill child process of a process (maximum two level). """Find and kill child processes of a process (maximum two level).
:param pid: PID of process (process ID) :param pid: PID of parent process (process ID)
:return: Nothing :return: Nothing
""" """
root_process_path = "/proc/{pid}/task/{pid}/children".format(pid=pid) root_process_path = "/proc/{pid}/task/{pid}/children".format(pid=pid)
@ -77,13 +77,36 @@ def kill_process_children_unix(pid):
os.kill(int(_pid), signal.SIGTERM) os.kill(int(_pid), signal.SIGTERM)
def kill_process_children_osx(pid):
"""Find and kill child processes of a process.
:param pid: PID of parent process (process ID)
:return: Nothing
"""
subprocess.run(['pkill', '-P', str(pid)])
def kill_process_children(pid):
"""Find and kill child processes of a process.
:param pid: PID of parent process (process ID)
:return: Nothing
"""
if sys.platform == 'darwin':
kill_process_children_osx(pid)
elif sys.platform == 'posix':
kill_process_children_unix(pid)
else:
pass # should signal error here
def kill_program_completly(proc): def kill_program_completly(proc):
"""Kill worker and it's child processes and exit. """Kill worker and it's child processes and exit.
:param proc: worker process (process ID) :param proc: worker process (process ID)
:return: Nothing :return: Nothing
""" """
kill_process_children_unix(proc.pid) kill_process_children(proc.pid)
proc.terminate() proc.terminate()
os._exit(0) os._exit(0)
@ -112,7 +135,7 @@ def watchdog(sleep_interval):
mtimes[filename] = mtime mtimes[filename] = mtime
continue continue
elif mtime > old_time: elif mtime > old_time:
kill_process_children_unix(worker_process.pid) kill_process_children(worker_process.pid)
worker_process = restart_with_reloader() worker_process = restart_with_reloader()
mtimes[filename] = mtime mtimes[filename] = mtime