summaryrefslogtreecommitdiff
path: root/src/rabbit_mnesia.erl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-10-01 16:21:39 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-10-01 16:21:39 +0100
commit1fef1a3cd8433dd91c43bb98f51302b3262c0b0e (patch)
treeaf8662a8b7dbc954fd722879a776c782147638cf /src/rabbit_mnesia.erl
parent9359c05eb2a22033a8b3ecaef08210686964cb6c (diff)
parent44da83019dd09b696d7ee4355bc7462f418c548e (diff)
downloadrabbitmq-server-git-1fef1a3cd8433dd91c43bb98f51302b3262c0b0e.tar.gz
Merged bug25780 into stable
Diffstat (limited to 'src/rabbit_mnesia.erl')
-rw-r--r--src/rabbit_mnesia.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index d058ac36ea..0ed6c7b2ef 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -399,7 +399,8 @@ node_info() ->
delegate_beam_hash(), cluster_status_from_mnesia()}.
node_type() ->
- DiscNodes = cluster_nodes(disc),
+ {_AllNodes, DiscNodes, _RunningNodes} =
+ rabbit_node_monitor:read_cluster_status(),
case DiscNodes =:= [] orelse me_in_nodes(DiscNodes) of
true -> disc;
false -> ram