summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-09-18 15:41:44 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-09-18 15:41:44 +0100
commitaf518c9a07917831fab0e76c82465f58a2455195 (patch)
tree196a5a81380875fdaa048caab1f12ded288a3a19 /src
parenta85d916b3444174f4fe1f43e61a65868728812db (diff)
downloadrabbitmq-server-git-af518c9a07917831fab0e76c82465f58a2455195.tar.gz
get rid of a helper
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mnesia.erl8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 0fb37d79f3..1fcff223ff 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -193,7 +193,7 @@ join_cluster(DiscoveryNode, NodeType) ->
rabbit_misc:local_info_msg("Clustering with ~p~n", [ClusterNodes]),
%% Join the cluster
- ok = init_db_with_mnesia(ClusterNodes, NodeType),
+ ok = init_db_with_mnesia(ClusterNodes, NodeType, true, true),
rabbit_node_monitor:notify_joined_cluster(),
@@ -278,7 +278,7 @@ update_cluster_nodes(DiscoveryNode) ->
%% nodes
mnesia:delete_schema([node()]),
rabbit_node_monitor:write_cluster_status(Status),
- init_db_with_mnesia(AllNodes, node_type());
+ init_db_with_mnesia(AllNodes, node_type(), true, true);
false ->
e(inconsistent_cluster)
end,
@@ -541,10 +541,6 @@ init_db_and_upgrade(ClusterNodes, NodeType, CheckOtherNodes) ->
end,
ok.
-
-init_db_with_mnesia(ClusterNodes, NodeType) ->
- init_db_with_mnesia(ClusterNodes, NodeType, true, true).
-
init_db_with_mnesia(ClusterNodes, NodeType,
CheckOtherNodes, CheckConsistency) ->
start_mnesia(CheckConsistency),