diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-09-12 21:07:28 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-09-12 21:07:28 +0300 |
| commit | 1b0096a925ba56af16d4776713a5c8e9593c587a (patch) | |
| tree | 608e7bfd4fff0f4679ea756c5f57c054df3b36a7 /scripts/rabbitmq-server | |
| parent | da7f18737edbda4752a3ec589f031e5b1f76e0a6 (diff) | |
| parent | c86b6a0a1bfaf43f114141730dd8215267bd96e8 (diff) | |
| download | rabbitmq-server-git-1b0096a925ba56af16d4776713a5c8e9593c587a.tar.gz | |
Merge branch 'stable'
Conflicts:
scripts/rabbitmq-env
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index a0500ebb87..48365252e5 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -262,9 +262,8 @@ else # When RabbitMQ runs in the foreground but the Erlang shell is # disabled, we setup signal handlers to stop RabbitMQ properly. This # is at least useful in the case of Docker. - # The Erlang VM should ignore SIGINT. - RABBITMQ_SERVER_START_ARGS="${RABBITMQ_SERVER_START_ARGS} +B i" + RABBITMQ_SERVER_START_ARGS="${RABBITMQ_SERVER_START_ARGS} ${RABBITMQ_IGNORE_SIGINT_FLAG}" # Signal handlers. They all stop RabbitMQ properly (using # rabbitmqctl stop). Depending on the signal, this script will exit |