diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-24 14:06:47 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-24 14:06:47 +0100 |
| commit | fa981c1417cb98a96508d6a32a712ee8436c7923 (patch) | |
| tree | eb572e7fab60dc578a42c4ce5fe6a0d04f2241e4 | |
| parent | 5dc2bc925925de789b1b287d3184eb8680c0f8b4 (diff) | |
| download | rabbitmq-server-fa981c1417cb98a96508d6a32a712ee8436c7923.tar.gz | |
logging and error reporting consistency
| -rw-r--r-- | src/rabbit_mnesia.erl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 05af43e0..0a8fc06a 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -187,14 +187,15 @@ join_cluster(DiscoveryNode, NodeType) -> %% return node to its virgin state, where it is not member of any %% cluster, has no cluster configuration, no local database, and no %% persisted messages -reset() -> reset(false). -force_reset() -> reset(true). +reset() -> + rabbit_misc:local_info_msg("Resetting Rabbit~n", []), + reset(false). + +force_reset() -> + rabbit_misc:local_info_msg("Resetting Rabbit forcefully~n", []), + reset(true). reset(Force) -> - rabbit_misc:local_info_msg("Resetting Rabbit~s~n", - [if Force -> " forcefully"; - true -> "" - end]), ensure_mnesia_not_running(), Node = node(), case Force of @@ -229,8 +230,8 @@ reset(Force) -> disconnect_nodes(Nodes) -> [erlang:disconnect_node(N) || N <- Nodes]. change_cluster_node_type(Type) -> - ensure_mnesia_dir(), ensure_mnesia_not_running(), + ensure_mnesia_dir(), case is_clustered() of false -> e(not_clustered); true -> ok @@ -243,7 +244,7 @@ change_cluster_node_type(Type) -> [] -> e(no_online_cluster_nodes); [Node0|_] -> Node0 end, - ok = reset(false), + ok = reset(), ok = join_cluster(Node, Type). update_cluster_nodes(DiscoveryNode) -> @@ -261,6 +262,8 @@ update_cluster_nodes(DiscoveryNode) -> %% nodes mnesia:delete_schema([node()]), rabbit_node_monitor:write_cluster_status(Status), + rabbit_misc:local_info_msg("Updating cluster nodes from ~p~n", + [DiscoveryNode]), init_db_with_mnesia(AllNodes, node_type(), true, true); false -> e(inconsistent_cluster) |