Skip to content

Commit

Permalink
Correct entrypoint.sh causing bootloop in some cases (#1628)
Browse files Browse the repository at this point in the history
* Correct bootloop in some cases.

Lines "kill -15 $SUPERVISOR_PID" then "wait $SUPERVISOR_PID" may fail if process is killed sufficiently fast. Command "ps -p" ensure process is still here before waiting to its state to change.

* Less output
  • Loading branch information
adferrand authored and solidnerd committed Jun 4, 2018
1 parent 29fa2ff commit 9b4f62f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ case ${1} in
SUPERVISOR_PID=$!
migrate_database
kill -15 $SUPERVISOR_PID
wait $SUPERVISOR_PID
ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID
rm -rf /var/run/supervisor.sock
exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
;;
Expand Down

0 comments on commit 9b4f62f

Please sign in to comment.