diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-08-11 14:48:20 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-08-11 14:48:20 +0200 |
| commit | 11feec626c6341e08b264320c4d6c90ae61d8f81 (patch) | |
| tree | 6c7d93f38c2a0fdb8688d1f19b2c0225e5245a18 | |
| parent | 699ce52eb0fc88bfa89e8f7162e402b07649398f (diff) | |
| parent | 0afe1f6693d45a6e30ee53595f7147f331a81177 (diff) | |
| download | rabbitmq-server-git-11feec626c6341e08b264320c4d6c90ae61d8f81.tar.gz | |
Merge branch 'rabbitmq-server-234' into stable
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
1 files changed, 2 insertions, 4 deletions
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 "$@" & |