From 22671b4aa4bafa9691b1baa59eb4ea9165e4745a Mon Sep 17 00:00:00 2001 From: Tobias Wich Date: Fri, 7 May 2021 17:10:27 +0200 Subject: [PATCH 1/2] Forward SIGTERM and SIGINT down to java process in wrapper script --- browsermob-dist/src/main/scripts/browsermob-proxy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browsermob-dist/src/main/scripts/browsermob-proxy b/browsermob-dist/src/main/scripts/browsermob-proxy index dc8f66897..935620315 100755 --- a/browsermob-dist/src/main/scripts/browsermob-proxy +++ b/browsermob-dist/src/main/scripts/browsermob-proxy @@ -9,11 +9,16 @@ then JAVACMD="java" fi +trap 'kill -TERM $PID' TERM INT "$JAVACMD" $JAVA_OPTS \ -Dapp.name="browsermob-proxy" \ -Dbasedir="$BASEDIR" \ -jar "$BASEDIR/lib/browsermob-dist-${project.version}.jar" \ - "$@" + "$@" & +PID=$! +wait $PID +trap - TERM INT +wait $PID # if we couldn't find java, print a helpful error message if [ $? -eq 127 ] From 60f6a34fb4755157635a0a87eb0ccc8ec48a8052 Mon Sep 17 00:00:00 2001 From: Tobias Wich Date: Fri, 7 May 2021 17:36:55 +0200 Subject: [PATCH 2/2] Add comment on rational behind trap code in shell wrapper --- browsermob-dist/src/main/scripts/browsermob-proxy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browsermob-dist/src/main/scripts/browsermob-proxy b/browsermob-dist/src/main/scripts/browsermob-proxy index 935620315..3ba455a1e 100755 --- a/browsermob-dist/src/main/scripts/browsermob-proxy +++ b/browsermob-dist/src/main/scripts/browsermob-proxy @@ -9,6 +9,8 @@ then JAVACMD="java" fi +# start process in the background and handle SIGTERM/SIGINT +# see https://veithen.io/2014/11/16/sigterm-propagation.html trap 'kill -TERM $PID' TERM INT "$JAVACMD" $JAVA_OPTS \ -Dapp.name="browsermob-proxy" \