diff options
| author | David Wragg <david@rabbitmq.com> | 2010-08-26 11:40:37 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-08-26 11:40:37 +0100 |
| commit | d851735c9834cfa49f42a8be1fa7365e34329c49 (patch) | |
| tree | 6f14a08b4845177feecae516a0f109a365c7656f | |
| parent | 49df29b81e486158806ae45417112926675aea35 (diff) | |
| parent | d985943a2dddbdd66488c4a8e99cd22c10325b4b (diff) | |
| download | rabbitmq-server-git-d851735c9834cfa49f42a8be1fa7365e34329c49.tar.gz | |
Merge bug23141 into default
rabbitmq-multi should detect a bad NODENAME
| -rw-r--r-- | src/rabbit_multi.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 3facef17f7..c7a5a60027 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -93,7 +93,14 @@ usage() -> action(start_all, [NodeCount], RpcTimeout) -> io:format("Starting all nodes...~n", []), application:load(rabbit), - NodeName = rabbit_misc:nodeparts(getenv("RABBITMQ_NODENAME")), + {_NodeNamePrefix, NodeHost} = NodeName = rabbit_misc:nodeparts( + getenv("RABBITMQ_NODENAME")), + case net_adm:names(NodeHost) of + {error, EpmdReason} -> + throw({cannot_connect_to_epmd, NodeHost, EpmdReason}); + {ok, _} -> + ok + end, {NodePids, Running} = case list_to_integer(NodeCount) of 1 -> {NodePid, Started} = start_node(rabbit_misc:makenode(NodeName), |