diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-09-12 14:27:26 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-09-12 14:27:26 +0100 |
| commit | 9b60b46d109afb33cffc92ce203f282279395c82 (patch) | |
| tree | 971f61ee5de241a08bb9ed1d7c466e320d011375 /scripts | |
| parent | dc8a921682342e2b44a3dd59a76b08643ff3c0b5 (diff) | |
| download | rabbitmq-server-git-9b60b46d109afb33cffc92ce203f282279395c82.tar.gz | |
ENV variable to override +B VM option
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 0fa164cfe1..e8583ab24e 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -183,6 +183,7 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_SERVER_CODE_PATH" ] && RABBITMQ_SERVER_CODE_PATH=${SERVER_CODE_PATH} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} +[ "x" = "x$RABBITMQ_IGNORE_SIGINT_FLAG" ] && RABBITMQ_IGNORE_SIGINT_FLAG="+B i" rmq_normalize_path_var \ RABBITMQ_CONFIG_FILE \ diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index c99022fcf6..7b0599e88f 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -224,9 +224,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 |