diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-12-07 14:52:22 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-12-07 14:52:22 +0300 |
| commit | e75061fc4426f3a9e07938d2bfb66a95dd371e0c (patch) | |
| tree | c7b2589d7415e8e802ee28983f8feb63566a030e | |
| parent | 169a325a66c19d8c92faadfd78cee3a5aac39bde (diff) | |
| parent | 85bbed9fa4d47adb5c523f6e3f130d54e435d1b9 (diff) | |
| download | rabbitmq-server-git-e75061fc4426f3a9e07938d2bfb66a95dd371e0c.tar.gz | |
Merge pull request #476 from rabbitmq/rabbitmq-server-470
Makes 'CTL forget_cluster_node' execute net_adm:ping/1 whilst in distributed mode
| -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 53b4d4c6b3..057a9f4e44 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -677,10 +677,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), |