diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-07-09 20:11:44 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-07-09 20:11:44 +0100 |
| commit | 06608e3aa0c98732a9404ccd3eed542b02401cff (patch) | |
| tree | c1a4b8516c2eefd70b3beadae3610f50dee47198 /src | |
| parent | 4a6c12e9e9edef71f6fd330fc8e8412818978433 (diff) | |
| download | rabbitmq-server-git-06608e3aa0c98732a9404ccd3eed542b02401cff.tar.gz | |
`cluster_status/{0,1}' now returns the status directly, fails on error
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index b1a4759a18..6f966f4fd0 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -406,24 +406,19 @@ is_disc_and_clustered() -> %% if offline. all_clustered_nodes() -> - {ok, AllNodes} = cluster_status(all), - AllNodes. + cluster_status(all). clustered_disc_nodes() -> - {ok, DiscNodes} =cluster_status(disc), - DiscNodes. + cluster_status(disc). clustered_ram_nodes() -> - {ok, AllNodes} = cluster_status(all), - {ok, DiscNodes} = cluster_status(disc), - ordsets:subtract(AllNodes, DiscNodes). + ordsets:subtract(cluster_status(all), cluster_status(disc)). running_clustered_nodes() -> - {ok, RunningNodes} = cluster_status(running), - RunningNodes. + cluster_status(running). running_clustered_disc_nodes() -> - {ok, {_, DiscNodes, RunningNodes}} = cluster_status(), + {_, DiscNodes, RunningNodes} = cluster_status(), ordsets:intersection(DiscNodes, RunningNodes). %% This function is the actual source of information, since it gets the data @@ -490,7 +485,8 @@ cluster_status(WhichNodes, ForceMnesia) -> end. cluster_status(WhichNodes) -> - cluster_status(WhichNodes, false). + {ok, Status} = cluster_status(WhichNodes, false), + Status. cluster_status() -> cluster_status(status). |