External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix supervisor restart behavior for ubuntu, and adjust timeouts *way*

Browse Source 
down on when supervisor can harikiri it's child processes
This commit is contained in:
Matthew Jones
2015-05-18 12:05:47 -04:00
parent 0589f5ad06
commit e4936e4b80
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/scripts/ansible-tower
View File

@@ -35,8 +35,24 @@ service_action() {
fi fi
# Allow supervisor time to cleanup child pids (ubuntu only) # Allow supervisor time to cleanup child pids (ubuntu only)
if [[ ${svc} == supervisor* && ${1} == stop && -e /etc/debian_version ]]; then if [[ ${svc} == supervisor* && ${1} == stop && -e /etc/debian_version ]]; then
echo "Waiting to allow supervisor time to cleanup ..." S_PID=$(pidof -x supervisord)
sleep 5 echo "Waiting to allow supervisor time to cleanup ... pid ${S_PID}"
if [ "${S_PID}" ]; then
i=0
while kill -0 "${S_PID}" 2> /dev/null; do
if [ $i = '60' ]; then
break;
else
if [ $i == '0' ]; then
echo -n " ... waiting"
else
echo -n "."
fi
i=$(($i+1))
sleep 1
fi
done
fi
fi fi
done done
} }