diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-08-11 18:33:01 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-08-11 18:33:01 +0100 |
commit | e39734ea3f22db65c54ff54e848daf93fee513b1 (patch) | |
tree | 82c83e60d99b4d3a3de9170e16ecb8e6c6fd1796 | |
parent | 3aa173d29e011081840018d367d00660e66b5eb8 (diff) | |
download | rabbitmq-server-e39734ea3f22db65c54ff54e848daf93fee513b1.tar.gz |
Don't log a silly warning if starting from scratch, tidy messages a bit.
-rw-r--r-- | src/rabbit_mnesia.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index d06bae71..e60388f0 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -127,17 +127,21 @@ init_from_config() -> {ok, Config} -> Config end, + case TryNodes of + [] -> init_db_and_upgrade([node()], disc, false); + _ -> auto_cluster(TryNodes, NodeType) + end. + +auto_cluster(TryNodes, NodeType) -> case find_good_node(nodes_excl_me(TryNodes)) of {ok, Node} -> - rabbit_log:info("Node '~p' selected for clustering from " - "configuration~n", [Node]), + rabbit_log:info("Node '~p' selected for auto-clustering~n", [Node]), {ok, {_, DiscNodes, _}} = discover_cluster0(Node), init_db_and_upgrade(DiscNodes, NodeType, true), rabbit_node_monitor:notify_joined_cluster(); none -> - rabbit_log:warning("Could not find any suitable node amongst the " - "ones provided in the configuration: ~p~n", - [TryNodes]), + rabbit_log:warning("Could not find any node for auto-clustering " + "from: ~p~n", [TryNodes]), init_db_and_upgrade([node()], disc, false) end. |