summaryrefslogtreecommitdiff
path: root/src/rabbit_node_monitor.erl
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-09-21 12:34:08 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-09-21 12:34:08 +0100
commit325ceeb402772b8484d4262bdea002dd9f9fc1a0 (patch)
tree6001034d9b935c293764840498bc24af95706453 /src/rabbit_node_monitor.erl
parent3b6fdaa7a21900a85a43c6f2fb6854fb5a9927eb (diff)
downloadrabbitmq-server-325ceeb402772b8484d4262bdea002dd9f9fc1a0.tar.gz
unify the various functions to get the cluster nodes into one
Diffstat (limited to 'src/rabbit_node_monitor.erl')
-rw-r--r--src/rabbit_node_monitor.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index f5877c9b..c1572762 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -179,7 +179,7 @@ node_up(Node, IsDiscNode) ->
notify_node_up() ->
Nodes = cluster_multicall(node_up, [node(), rabbit_mnesia:node_type()]),
%% register other active rabbits with this rabbit
- [ node_up(N, lists:member(N, rabbit_mnesia:clustered_disc_nodes())) ||
+ [ node_up(N, lists:member(N, rabbit_mnesia:cluster_nodes(disc))) ||
N <- Nodes ],
ok.
@@ -268,7 +268,7 @@ handle_live_rabbit(Node) ->
cluster_multicall(Fun, Args) ->
Node = node(),
- Nodes = rabbit_mnesia:running_clustered_nodes() -- [Node],
+ Nodes = rabbit_mnesia:cluster_nodes(running) -- [Node],
%% notify other rabbits of this cluster
case rpc:multicall(Nodes, rabbit_node_monitor, Fun, Args,
?RABBIT_UP_RPC_TIMEOUT) of