From ca0824293e17ee094ccb4f0df5023b1b7c30adba Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 10 Oct 2023 11:24:39 -0500 Subject: [PATCH] Issue #10696 - disable internal pid-file management of start-stop-daemon Signed-off-by: Joakim Erdfelt --- jetty-home/src/main/resources/bin/jetty.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-home/src/main/resources/bin/jetty.sh b/jetty-home/src/main/resources/bin/jetty.sh index 3080322977ce..9d7d78e6e9e2 100755 --- a/jetty-home/src/main/resources/bin/jetty.sh +++ b/jetty-home/src/main/resources/bin/jetty.sh @@ -525,7 +525,6 @@ then START_STOP_DAEMON_AVAILABLE=1 else USE_START_STOP_DAEMON=0 - JETTY_ARGS=(${JETTY_ARGS[*]} "--module=pid" "jetty.pid=$JETTY_PID") fi fi @@ -582,13 +581,14 @@ case "$ACTION" in CH_USER="--chuid $JETTY_USER" fi + # use of --pidfile /dev/null disables internal pidfile + # management of the start-stop-daemon (see man page) echo ${RUN_ARGS[@]} | xargs start-stop-daemon \ --start $CH_USER \ - --pidfile "$JETTY_PID" \ + --pidfile /dev/null \ --chdir "$JETTY_BASE" \ --background \ - --output "${JETTY_RUN}/start-stop.log" - --make-pidfile \ + --output "${JETTY_RUN}/start-stop.log" \ --startas "$JAVA" \ -- (( DEBUG )) && echo "Starting: start-stop-daemon"