summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-12-09 10:31:42 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-12-09 10:31:42 +0000
commit90d553d02219327a54bb90a6a2e03356cecdedb5 (patch)
treed8f2bdec29f1ae551d28f2b92fd3b0877fc0aec1
parente76617eacf49f459700f29fa66cbb377465e085e (diff)
downloadrabbitmq-server-90d553d02219327a54bb90a6a2e03356cecdedb5.tar.gz
Ensure become(node()) works rather than failing with {node_running, ...}.
-rw-r--r--src/rabbit_control_main.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index e7e28890..2d5094a6 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -597,11 +597,11 @@ start_distribution() ->
{ok, _} = net_kernel:start([list_to_atom(CtlNodeName), name_type()]).
become(BecomeNode) ->
+ error_logger:tty(false),
+ ok = net_kernel:stop(),
case net_adm:ping(BecomeNode) of
pong -> exit({node_running, BecomeNode});
pang -> io:format(" * Impersonating node: ~s...", [BecomeNode]),
- error_logger:tty(false),
- ok = net_kernel:stop(),
{ok, _} = net_kernel:start([BecomeNode, name_type()]),
io:format(" done~n", []),
Dir = mnesia:system_info(directory),