diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-10-17 18:17:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-10-17 18:17:13 +0100 |
| commit | 2478b40901922dcf923a978dcbe7bea7979e1eb7 (patch) | |
| tree | 5ba6ce62b18ab66411a3414ec8dc7ff2f9cd2536 /scripts/rabbitmq-server | |
| parent | ca64918f95642f0b4c1a108528d64166f3cf86b7 (diff) | |
| parent | c33ba94384546db803bee2ea9b8124d4f7e774c2 (diff) | |
| download | rabbitmq-server-git-2478b40901922dcf923a978dcbe7bea7979e1eb7.tar.gz | |
Merge bug18626
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 96458094a3..aea8bfc90a 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -54,7 +54,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -noinput \ -hidden \ -s rabbit_prelaunch \ - -sname rabbitmqprelaunch$$ \ + ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \ -extra "${RABBITMQ_NODENAME}" PRELAUNCH_RESULT=$? @@ -85,7 +85,7 @@ RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ ${RABBITMQ_START_RABBIT} \ - -sname ${RABBITMQ_NODENAME} \ + ${RABBITMQ_NAME_TYPE} ${RABBITMQ_NODENAME} \ -boot "${SASL_BOOT_FILE}" \ ${RABBITMQ_CONFIG_ARG} \ +W w \ |