From 90d553d02219327a54bb90a6a2e03356cecdedb5 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Tue, 9 Dec 2014 10:31:42 +0000
Subject: Ensure become(node()) works rather than failing with {node_running,
 ...}.

---
 src/rabbit_control_main.erl | 4 ++--
 1 file 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),
-- 
cgit v1.2.1