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-env | |
| 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-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 0b0d51ed46..206bdd0c20 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -189,6 +189,8 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR} [ "x" = "x$RABBITMQ_ADVANCED_CONFIG_FILE" ] && RABBITMQ_ADVANCED_CONFIG_FILE=${ADVANCED_CONFIG_FILE} [ "x" = "x$RABBITMQ_SCHEMA_DIR" ] && RABBITMQ_SCHEMA_DIR=${SCHEMA_DIR} +[ "x" = "x$RABBITMQ_IGNORE_SIGINT" ] && RABBITMQ_IGNORE_SIGINT="true" +[ "xtrue" = "x$RABBITMQ_IGNORE_SIGINT" ] && RABBITMQ_IGNORE_SIGINT_FLAG="+B i" rmq_normalize_path_var \ RABBITMQ_CONFIG_FILE \ |