diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-08-14 11:03:50 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-08-14 11:03:50 +0300 |
| commit | e25e906d958b7cfdadda385da8ed865414fe8603 (patch) | |
| tree | 16ec1eac3d37c15cb03f841109bc3d30078c3365 /scripts | |
| parent | 93682bd779b4af0f1350dd9363be727418d081bf (diff) | |
| parent | 703ea5abe6b7fd1cb2008d4e1c990de4593de90d (diff) | |
| download | rabbitmq-server-git-e25e906d958b7cfdadda385da8ed865414fe8603.tar.gz | |
Merge branch 'master' into rabbitmq-server-500-squashed
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 6d82588ee2..a0500ebb87 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -67,6 +67,17 @@ if [ "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_ADVANCED_CONFI RABBITMQ_ADVANCED_CONFIG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}" fi +# `net_kernel:start/1` will fail in `longnames` mode when erlang is +# unable to determine FQDN of a node (with a dot in it). But `erl` +# itself has some magic that still allow it to start when you +# explicitly specify host (a.la `erl -name test@localhost`). +# +# It's not possible to communicate with this node, unless it's a +# connection initiator. But as prelaunch IS an initiator, it doesn't +# matter what we actually put here. But `localhost` sounds good +# enough. +RABBITMQ_PRELAUNCH_NODENAME="rabbitmqprelaunch${$}@localhost" + # NOTIFY_SOCKET is needed here to prevent epmd from impersonating the # success of our startup sequence to systemd. NOTIFY_SOCKET= \ @@ -77,7 +88,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -noinput \ -hidden \ -s rabbit_prelaunch \ - ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \ + ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ |