diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-09 14:56:51 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-09 14:56:51 +0000 |
| commit | 3de0921770a3c41779889880082db467ef6edac4 (patch) | |
| tree | 32c0b8e5a800f12aea91a041df246d351269b664 /scripts | |
| parent | de451393f149a41ce7af56195557ccc8d78e8a7d (diff) | |
| parent | 61cc6e5a764a765f9d36e30ee0e6de58b06ffd6c (diff) | |
| download | rabbitmq-server-git-3de0921770a3c41779889880082db467ef6edac4.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-service.bat | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 11427a3dc1..a0168c5c93 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -131,6 +131,12 @@ if ERRORLEVEL 3 ( set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!
)
+ REM Try to create config file, if it doesn't exist
+ REM It still can fail to be created, but at least not for default install
+if not exist "!RABBITMQ_CONFIG_FILE!.config" (
+ echo []. > !RABBITMQ_CONFIG_FILE!.config
+)
+
if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
) else (
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 3705b9a979..2336c3d466 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -30,7 +30,7 @@ fi RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \ exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ - -noinput \ + -noinput +B \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ -boot "${CLEAN_BOOT_FILE}" \ |