diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-12-10 16:59:17 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-12-10 16:59:17 +0000 |
| commit | bc84fdb7ff3a2a450a90d49f427e3ca728607926 (patch) | |
| tree | 8cfa4baa48fb30e117385aa31e12985d25f9731b | |
| parent | 26605ed42eba71b543bb91c55155d29c325d8abf (diff) | |
| download | rabbitmq-server-bc84fdb7ff3a2a450a90d49f427e3ca728607926.tar.gz | |
Ensure we can cope with no specified nodename (misc:makenode takes care of this); ensure we start the prelaunch node as a distributed node (same trick as with ctl); the absence of epmd is subsequently a fatal error
| -rwxr-xr-x | scripts/rabbitmq-server | 1 | ||||
| -rw-r--r-- | src/rabbit_prelaunch.erl | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 5b291290..f0db3d50 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -90,6 +90,7 @@ if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then -noinput \ -hidden \ -s rabbit_prelaunch \ + -sname rabbitmqprelaunch$$ \ -extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}" then RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit" diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 867ecb12..0c820a11 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -260,7 +260,7 @@ duplicate_node_check([]) -> %% Ignore running node while installing windows service ok; duplicate_node_check(Node) -> - {NodeName, NodeHost} = rabbit_misc:nodeparts(Node), + {NodeName, NodeHost} = rabbit_misc:nodeparts(rabbit_misc:makenode(Node)), case net_adm:names(NodeHost) of {ok, NamePorts} -> case proplists:is_defined(NodeName, NamePorts) of @@ -272,7 +272,6 @@ duplicate_node_check(Node) -> terminate(?ERROR_CODE); false -> ok end; - {error, address} -> ok; {error, EpmdReason} -> terminate("unexpected epmd error: ~p~n", [EpmdReason]) end. |