start_devserver: do not forward kill signal to devserver
This is a slight modification to a previous fix, in which
start_devserver would catch various signals and forward them (kill) to
the underlying devserver. Apparently, SIGINT is being ignored by the
Python interpreter, leaving an orphaned child process running. Instead,
we just kill with the default signal (SIGTERM).
BUG=None
TEST=devserver dies properly with Ctrl-C
Change-Id: I88c83512b119e7cc66e632083aa1fc5ae27221dc
Reviewed-on: https://gerrit.chromium.org/gerrit/32107
Reviewed-by: Darin Petkov <petkov@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
diff --git a/host/start_devserver b/host/start_devserver
index 34666b9..00da1c8 100755
--- a/host/start_devserver
+++ b/host/start_devserver
@@ -14,10 +14,8 @@
export DEFAULT_INSTALL_MASK
-# Trap and record various signals.
-for sig in INT TERM QUIT; do
- trap "trap_sig=${sig}" ${sig}
-done
+# Trap various signals.
+trap 'trap_flag=1' INT TERM QUIT
# Spawn devserver in the background, record its pid.
if [ -f /usr/lib/devserver/devserver.py ]; then
@@ -30,7 +28,7 @@
# Wait for devserver to die, or a signal.
wait
-# If interrupted by signal, forward it to the devserver.
-if [ -n "${trap_sig}" ]; then
- kill -s ${trap_sig} ${devserver_pid}
+# If interrupted by signal, kill the devserver.
+if [ -n "${trap_flag}" ]; then
+ kill ${devserver_pid}
fi
