fix launcher script terminating before child terminates on SIGTERM

bazel-contrib · Nov 25, 2020 · 2c73fde · 2c73fde
1 parent 11ef188
commit 2c73fde
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/node/launcher.sh b/internal/node/launcher.sh
@@ -332,6 +332,12 @@ readonly child=$!
 trap _term SIGTERM
 trap _int SIGINT
 wait "${child}"
+# Remove trap after first signal has been receieved and wait for child to exit
+# (first wait returns immediatel if SIGTERM is received while waiting). Second
+# wait is a no-op if child has already terminated.
+trap - SIGTERM SIGINT
+wait "${child}"
+
 RESULT="$?"
 set -e