github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed force kill variable name, added a default setting for it, and added code to the stop function to handle inability to stop when not forcing

Browse source 
Fixes #4991, #5168
This commit is contained in:
Cheyenne T. Greatorex 2016-04-21 16:00:42 -04:00 • committed by Suyog Rao
parent 2a7b5668ca
commit eca8f82adf
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/logstash.default
View file

@ -38,4 +38,4 @@
# If this is set to 1, then when `stop` is called, if the process has # If this is set to 1, then when `stop` is called, if the process has
# not exited within a reasonable time, SIGKILL will be sent next. # not exited within a reasonable time, SIGKILL will be sent next.
# The default behavior is to simply log a message "program stop failed; still running" # The default behavior is to simply log a message "program stop failed; still running"
KILL_ON_STOP_TIMEOUT=0 #KILL_ON_STOP_TIMEOUT=0

4
pkg/logstash.sysv
View file

@ -35,6 +35,7 @@ LS_LOG_FILE="${LS_LOG_DIR}/$name.log"
LS_CONF_DIR=/etc/logstash/conf.d LS_CONF_DIR=/etc/logstash/conf.d
LS_OPEN_FILES=16384 LS_OPEN_FILES=16384
LS_NICE=19 LS_NICE=19
KILL_ON_STOP_TIMEOUT=0
LS_OPTS="" LS_OPTS=""
@ -96,12 +97,13 @@ stop() {
sleep 1 sleep 1
done done
if status ; then if status ; then
if [ $KILL_ON_STOP_TIMEOUT -eq 1 ] ; then if [ "$KILL_ON_STOP_TIMEOUT" == 1 ] ; then
echo "Timeout reached. Killing $name (pid $pid) with SIGKILL. This may result in data loss." echo "Timeout reached. Killing $name (pid $pid) with SIGKILL. This may result in data loss."
kill -KILL $pid kill -KILL $pid
echo "$name killed with SIGKILL." echo "$name killed with SIGKILL."
else else
echo "$name stop failed; still running." echo "$name stop failed; still running."
return 1 # stop timed out and not forced
fi fi
else else
echo "$name stopped." echo "$name stopped."