openstack/devstack
Code Issues Proposed changes

Merge "Kill spinner process when stack.sh exits"

Browse Source
This commit is contained in:
Jenkins 2014-05-02 19:20:29 +00:00 committed by Gerrit Code Review
commit 0154badc2b
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 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 text to the log file, summary log file and stdout
# echo_summary "something to say" # echo_summary "something to say"
function echo_summary { function echo_summary {
if [[ -t 3 && "$VERBOSE" != "True" ]]; then if [[ -t 3 && "$VERBOSE" != "True" ]]; then
kill >/dev/null 2>&1 $LAST_SPINNER_PID kill_spinner
if [ ! -z "$LAST_SPINNER_PID" ]; then
printf "\b\b\bdone\n" >&3
fi
echo -n -e $@ >&6 echo -n -e $@ >&6
spinner & spinner &
LAST_SPINNER_PID=$! LAST_SPINNER_PID=$!
@ -612,6 +616,10 @@ function exit_trap {
echo "exit_trap: cleaning up child processes" echo "exit_trap: cleaning up child processes"
kill 2>&1 $jobs kill 2>&1 $jobs
fi fi
# Kill the last spinner process
kill_spinner
exit $r exit $r
} }