diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-12-07 14:53:08 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-12-07 14:53:08 +0300 |
| commit | 3c2136053a7f704b15cb2b252384488b638a75b4 (patch) | |
| tree | f4bcdfbeefe04058c3ed01001784390cf466c9a9 | |
| parent | 9bacf06c3ade074fe4ae1149236f94ad61dc667f (diff) | |
| parent | e75061fc4426f3a9e07938d2bfb66a95dd371e0c (diff) | |
| download | rabbitmq-server-git-3c2136053a7f704b15cb2b252384488b638a75b4.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_control_main.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 9d40801291..c064e82ac6 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -689,10 +689,10 @@ read_pid_file(PidFile, Wait) -> 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]), + pang -> ok = net_kernel:stop(), + io:format(" * Impersonating node: ~s...", [BecomeNode]), {ok, _} = rabbit_cli:start_distribution(BecomeNode), io:format(" done~n", []), Dir = mnesia:system_info(directory), |