openstack/devstack
Code Issues Proposed changes

Kill spinner process when stack.sh exits

Browse Source 
The last spinner process active in non-verbose mode does not get killed
when stack.sh exits -- the spinner keeps spinning indefinitely.

Killing the spinner in err_exit cleans up no matter how the program
got terminated.

Because the code to kill the spinner is now called regardless of
whether spinners are in use, it has to check LAST_SPINNER_PID or the
kill command without an argument will trigger the ERR trap (or EXIT
with an error status, depending on where program execution stops).

This patch resurrects and fixes an abandoned changeset, hence:

Co-Authored-By: Adalberto Medeiros <adalbas@linux.vnet.ibm.com>

Fixes bug 1302112

Change-Id: I2d5b27971889b672361e9173bf6faf38fb1a1ec6
This commit is contained in:
Roger Luethi 2014-04-26 14:21:33 +02:00
parent b61fc03102
commit de56ee15c7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stack.sh
View File

@ -494,14 +494,18 @@ function spinner {
done
}
function kill_spinner {
if [ ! -z "$LAST_SPINNER_PID" ]; then
kill >/dev/null 2>&1 $LAST_SPINNER_PID
printf "\b\b\bdone\n" >&3
fi
}
# Echo text to the log file, summary log file and stdout
# echo_summary "something to say"
function echo_summary {
if [[ -t 3 && "$VERBOSE" != "True" ]]; then
kill >/dev/null 2>&1 $LAST_SPINNER_PID
if [ ! -z "$LAST_SPINNER_PID" ]; then
printf "\b\b\bdone\n" >&3
fi
kill_spinner
echo -n -e $@ >&6
spinner &
LAST_SPINNER_PID=$!
@ -612,6 +616,10 @@ function exit_trap {
echo "exit_trap: cleaning up child processes"
kill 2>&1 $jobs
fi
# Kill the last spinner process
kill_spinner
exit $r
}