diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-08-11 14:48:41 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-08-11 14:48:41 +0200 |
| commit | 9b0752685d65bb73a19912a494efbb70cbcd8e6f (patch) | |
| tree | b635e437c4518b6c7818dcacd6d25774e7da4af3 | |
| parent | a585ac27e02bec19c57a733ecc79263270b84422 (diff) | |
| parent | 11feec626c6341e08b264320c4d6c90ae61d8f81 (diff) | |
| download | rabbitmq-server-git-9b0752685d65bb73a19912a494efbb70cbcd8e6f.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -255,7 +255,11 @@ clear-resource-alarm: all $(ERL_CALL) stop-node: - -$(ERL_CALL) -q + -( \ + pid=$$(./scripts/rabbitmqctl -n $(RABBITMQ_NODENAME) eval 'os:getpid().') && \ + $(ERL_CALL) -q && \ + while ps -p $$pid >/dev/null 2>&1; do sleep 1; done \ + ) # code coverage will be created for subdirectory "ebin" of COVER_DIR COVER_DIR=. diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 6a16a4971a..71a6530321 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -155,10 +155,8 @@ if [ 'x' = "x$RABBITMQ_ALLOW_INPUT" -a -z "$detached" ]; then # SIGINT # They are considered an abnormal process termination, the script # exits with the job exit code. - # EXIT - # This is not a signal. The script exits with the job exit code. - trap "stop_rabbitmq_server; trap - EXIT; exit 0" HUP TERM TSTP - trap "stop_rabbitmq_server; trap - EXIT" EXIT INT + trap "stop_rabbitmq_server; exit 0" HUP TERM TSTP + trap "stop_rabbitmq_server" INT start_rabbitmq_server "$@" & |