openstack/devstack
Code Issues Proposed changes

Merge "Skip child process kills in stack.sh exit trap"

Browse Source
This commit is contained in:
Jenkins
2014-03-21 21:12:25 +00:00
committed by Gerrit Code Review
parent 62f649dacb a3935fb0ad
commit cbfb07e97d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@@ -595,7 +595,9 @@ trap exit_trap EXIT
function exit_trap { function exit_trap {
local r=$? local r=$?
jobs=$(jobs -p) jobs=$(jobs -p)
if [[ -n $jobs ]]; then # Only do the kill when we're logging through a process substitution,
# which currently is only to verbose logfile
if [[ -n $jobs && -n "$LOGFILE" && "$VERBOSE" == "True" ]]; then
echo "exit_trap: cleaning up child processes" echo "exit_trap: cleaning up child processes"
kill 2>&1 $jobs kill 2>&1 $jobs
fi fi