summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-05-22 11:34:16 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-05-22 11:34:16 +0100
commit5901596450d8b0f289b5a4cf9b7fbfbac43874ec (patch)
tree3c65d5120ca9c655eb962a2e93499cf54b6f9110
parent0e4afa86a0f62d14105c4a94158fe3c9b1adf282 (diff)
downloadrabbitmq-server-git-5901596450d8b0f289b5a4cf9b7fbfbac43874ec.tar.gz
fix but in `rabbit_mnesia:status/0'
-rw-r--r--src/rabbit_mnesia.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 44ee27253f..69bc0d3acf 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -272,8 +272,11 @@ recluster(DiscoveryNode) ->
%%----------------------------------------------------------------------------
status() ->
- [{nodes,
- {{disc, all_clustered_disc_nodes()}, {ram, all_clustered_ram_nodes()}}},
+ IfNonEmpty = fun (_, []) -> [];
+ (Type, Nodes) -> [{Type, Nodes}]
+ end,
+ [{nodes, (IfNonEmpty(disc, all_clustered_disc_nodes()) ++
+ IfNonEmpty(ram, all_clustered_ram_nodes()))},
{running_nodes, running_clustered_nodes()}].
is_db_empty() ->