Update force-stop to respect STOP_WAIT_TIME

Closes gh-6223
This commit is contained in:
Phillip Webb 2016-12-30 13:23:47 -08:00
parent 89569db75a
commit a35a1022c2

View File

@ -212,9 +212,9 @@ force_stop() {
do_force_stop() {
kill -9 "$1" &> /dev/null || { echoRed "Unable to kill process $1"; return 1; }
for i in $(seq 1 60); do
for i in $(seq 1 $STOP_WAIT_TIME); do
isRunning "$1" || { echoGreen "Stopped [$1]"; rm -f "$2"; return 0; }
[[ $i -eq 30 ]] && kill -9 "$1" &> /dev/null
[[ $i -eq STOP_WAIT_TIME/2 ]] && kill "$1" &> /dev/null
sleep 1
done
echoRed "Unable to kill process $1";