Skip to content

Commit

Permalink
Issue #10696 - disable internal pid-file management of start-stop-daemon
Browse files Browse the repository at this point in the history
Signed-off-by: Joakim Erdfelt <[email protected]>
  • Loading branch information
joakime committed Oct 10, 2023
1 parent fb97bd9 commit ca08242
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions jetty-home/src/main/resources/bin/jetty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit ca08242

Please sign in to comment.