summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-21 17:54:08 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-21 17:54:08 +0100
commit0fc771bc246b22eae9a53dedf1362b9b405e59b0 (patch)
treeabdaf7830a6005447f1b7f7098913f1e32e16bc4
parent634d471b7ba29e1942807bf0123aa98bd03108ce (diff)
downloadrabbitmq-server-0fc771bc246b22eae9a53dedf1362b9b405e59b0.tar.gz
remove starting/stopping improvements
Moving to another branch... but I need the diff.
-rw-r--r--src/rabbit_mnesia.erl14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 846a12b1..f151b7cf 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -85,9 +85,7 @@ status() ->
no -> case all_clustered_nodes() of
[] -> [];
Nodes -> [{unknown, Nodes}]
- end;
- Reason when Reason =:= starting; Reason =:= stopping ->
- exit({rabbit_busy, try_again_later})
+ end
end},
{running_nodes, running_clustered_nodes()}].
@@ -339,19 +337,13 @@ ensure_mnesia_dir() ->
ensure_mnesia_running() ->
case mnesia:system_info(is_running) of
yes -> ok;
- starting -> waiting_for(mnesia_running),
- ensure_mnesia_running();
- Reason when Reason =:= no; Reason =:= stopping ->
- throw({error, mnesia_not_running})
+ no -> throw({error, mnesia_not_running})
end.
ensure_mnesia_not_running() ->
case mnesia:system_info(is_running) of
no -> ok;
- stopping -> waiting_for(mnesia_not_running),
- ensure_mnesia_not_running();
- Reason when Reason =:= yes; Reason =:= starting ->
- throw({error, mnesia_unexpectedly_running})
+ yes -> throw({error, mnesia_unexpectedly_running})
end.
waiting_for(Condition) ->