Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-07-19 00:11:01 +02:00
Code Releases Activity

join_cluster: Handle also atom arguments, useful for mod_libcluster

Browse Source
This commit is contained in:
Badlop 2024-06-25 16:50:03 +02:00
parent f3ad49ebc4
commit 9b9eb409b2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ejabberd_admin.erl
View File

@ -834,8 +834,9 @@ convert_to_yaml(In, Out) ->
%%% Cluster management %%% Cluster management
%%% %%%
join_cluster(NodeBin) -> join_cluster(NodeBin) when is_binary(NodeBin) ->
Node = list_to_atom(binary_to_list(NodeBin)), join_cluster(list_to_atom(binary_to_list(NodeBin)));
join_cluster(Node) when is_atom(Node) ->
IsNodes = lists:member(Node, ejabberd_cluster:get_nodes()), IsNodes = lists:member(Node, ejabberd_cluster:get_nodes()),
IsKnownNodes = lists:member(Node, ejabberd_cluster:get_known_nodes()), IsKnownNodes = lists:member(Node, ejabberd_cluster:get_known_nodes()),
Ping = net_adm:ping(Node), Ping = net_adm:ping(Node),
@ -876,8 +877,10 @@ join_cluster_here(Node, false, false, pong) ->
{error, io_lib:format("Can't join node to this cluster: ~p", [Error])} {error, io_lib:format("Can't join node to this cluster: ~p", [Error])}
end. end.
leave_cluster(NodeBin) -> leave_cluster(NodeBin) when is_binary(NodeBin) ->
ejabberd_cluster:leave(list_to_atom(binary_to_list(NodeBin))). leave_cluster(list_to_atom(binary_to_list(NodeBin)));
leave_cluster(Node) ->
ejabberd_cluster:leave(Node).
list_cluster() -> list_cluster() ->
ejabberd_cluster:get_nodes(). ejabberd_cluster:get_nodes().