yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rm net_adm:ping

This commit is contained in:
turtled 2016-12-14 18:09:41 +08:00
parent 15a2b265be
commit 737a89d5e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emqttd_cluster.erl
View File

@ -30,12 +30,12 @@ join(Node) when Node =:= node() ->
{error, {cannot_join_with_self, Node}}; {error, {cannot_join_with_self, Node}};
join(Node) when is_atom(Node) -> join(Node) when is_atom(Node) ->
case {net_adm:ping(Node), is_clustered(Node), emqttd:is_running(Node)} of case {is_clustered(Node), emqttd:is_running(Node)} of
{pong, false, true} -> {false, true} ->
prepare(), ok = emqttd_mnesia:join_cluster(Node), reboot(); prepare(), ok = emqttd_mnesia:join_cluster(Node), reboot();
{_, false, false} -> {false, false} ->
{error, {node_not_running, Node}}; {error, {node_not_running, Node}};
{_, true, _} -> {true, _} ->
{error, {already_clustered, Node}} {error, {already_clustered, Node}}
end. end.