paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

run-dev: Wait for children to exit on Ctrl+C after killing them.

Browse Source 
In addition to being generally more correct, this works around a bug
in Node.js that causes webpack-dev-server to corrupt the terminal
state when exiting as a background process.

https://github.com/nodejs/node/issues/35536

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-10-06 17:15:26 -07:00
committed by Tim Abbott
parent 1c7db528bd
commit f81a5e87ed
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/run-dev.py
View File

@@ -5,7 +5,6 @@ import pwd
import signal import signal
import subprocess import subprocess
import sys import sys
import traceback
from typing import Any, Callable, Generator, List, Sequence from typing import Any, Callable, Generator, List, Sequence
from urllib.parse import urlunparse from urllib.parse import urlunparse
@@ -164,7 +163,7 @@ def do_one_time_webpack_compile() -> None:
# with a running development server. # with a running development server.
subprocess.check_call(['./tools/webpack', '--quiet', '--test']) subprocess.check_call(['./tools/webpack', '--quiet', '--test'])
def start_webpack_watcher() -> None: def start_webpack_watcher() -> "subprocess.Popen[bytes]":
webpack_cmd = ['./tools/webpack', '--watch', f'--port={webpack_port}'] webpack_cmd = ['./tools/webpack', '--watch', f'--port={webpack_port}']
if options.minify: if options.minify:
webpack_cmd.append('--minify') webpack_cmd.append('--minify')
@@ -176,7 +175,7 @@ def start_webpack_watcher() -> None:
webpack_cmd.append(f"--host={options.interface}") webpack_cmd.append(f"--host={options.interface}")
else: else:
webpack_cmd.append("--host=0.0.0.0") webpack_cmd.append("--host=0.0.0.0")
subprocess.Popen(webpack_cmd) return subprocess.Popen(webpack_cmd)
def transform_url(protocol: str, path: str, query: str, target_port: int, target_host: str) -> str: def transform_url(protocol: str, path: str, query: str, target_port: int, target_host: str) -> str:
# generate url with target host # generate url with target host
@@ -362,15 +361,17 @@ def print_listeners() -> None:
proxy_warning = f"Only the proxy port ({proxy_port}) is exposed." proxy_warning = f"Only the proxy port ({proxy_port}) is exposed."
print(WARNING + "Note to Vagrant users: " + ENDC + proxy_warning + '\n') print(WARNING + "Note to Vagrant users: " + ENDC + proxy_warning + '\n')
if options.test: children = []
do_one_time_webpack_compile()
else:
start_webpack_watcher()
for cmd in server_processes():
subprocess.Popen(cmd)
try: try:
if options.test:
do_one_time_webpack_compile()
else:
children.append(start_webpack_watcher())
for cmd in server_processes():
children.append(subprocess.Popen(cmd))
app = Application(enable_logging=options.enable_tornado_logging) app = Application(enable_logging=options.enable_tornado_logging)
try: try:
app.listen(proxy_port, address=options.interface) app.listen(proxy_port, address=options.interface)
@@ -385,12 +386,13 @@ try:
for s in (signal.SIGINT, signal.SIGTERM): for s in (signal.SIGINT, signal.SIGTERM):
signal.signal(s, shutdown_handler) signal.signal(s, shutdown_handler)
ioloop.start() ioloop.start()
except Exception:
# Print the traceback before we get SIGTERM and die.
traceback.print_exc()
raise
finally: finally:
# Kill everything in our process group. for child in children:
os.killpg(0, signal.SIGTERM) child.terminate()
print("Waiting for children to stop...")
for child in children:
child.wait()
# Remove pid file when development server closed correctly. # Remove pid file when development server closed correctly.
os.remove(pid_file_path) os.remove(pid_file_path)