diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-24 23:21:28 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-24 23:21:28 +0100 |
| commit | 3abb3169343c6177ee504e19a3da7d5b8f1c5caf (patch) | |
| tree | 5e20bd54e5a370f3d46a67e78151d4cac92f4344 | |
| parent | 0fdf84d0394ecf55c7be591662a3e9aa297d374b (diff) | |
| download | rabbitmq-server-git-3abb3169343c6177ee504e19a3da7d5b8f1c5caf.tar.gz | |
more workingness (and efficiency)
| -rw-r--r-- | src/rabbit_node_monitor.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index f906e9f1ff..e1f7b81702 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -158,8 +158,11 @@ notify_left_cluster(Node) -> 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:cluster_nodes(disc))) || - N <- Nodes ], + DiskNodes = rabbit_mnesia:cluster_nodes(disc), + [node_up(N, case lists:member(N, DiskNodes) of + true -> disk; + false -> ram + end) || N <- Nodes], ok. joined_cluster(Node, NodeType) -> @@ -168,8 +171,8 @@ joined_cluster(Node, NodeType) -> left_cluster(Node) -> gen_server:cast(?SERVER, {left_cluster, Node}). -node_up(Node, IsDiscNode) -> - gen_server:cast(?SERVER, {node_up, Node, IsDiscNode}). +node_up(Node, NodeType) -> + gen_server:cast(?SERVER, {node_up, Node, NodeType}). %%---------------------------------------------------------------------------- %% gen_server callbacks |