From 15a2b265be663fc981e55968796011cbf0d7315c Mon Sep 17 00:00:00 2001 From: turtled Date: Tue, 13 Dec 2016 16:57:18 +0800 Subject: [PATCH] fixed cluster fail --- src/emqttd_cluster.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emqttd_cluster.erl b/src/emqttd_cluster.erl index d5494a6b9..33eda2499 100644 --- a/src/emqttd_cluster.erl +++ b/src/emqttd_cluster.erl @@ -30,12 +30,12 @@ join(Node) when Node =:= node() -> {error, {cannot_join_with_self, Node}}; join(Node) when is_atom(Node) -> - case {is_clustered(Node), emqttd:is_running(Node)} of - {false, true} -> + case {net_adm:ping(Node), is_clustered(Node), emqttd:is_running(Node)} of + {pong, false, true} -> prepare(), ok = emqttd_mnesia:join_cluster(Node), reboot(); - {false, false} -> + {_, false, false} -> {error, {node_not_running, Node}}; - {true, _} -> + {_, true, _} -> {error, {already_clustered, Node}} end.