diff options
Diffstat (limited to 'deps/rabbit/src/rabbit_mnesia.erl')
| -rw-r--r-- | deps/rabbit/src/rabbit_mnesia.erl | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/deps/rabbit/src/rabbit_mnesia.erl b/deps/rabbit/src/rabbit_mnesia.erl index 9a02df80a7..b834b3afb7 100644 --- a/deps/rabbit/src/rabbit_mnesia.erl +++ b/deps/rabbit/src/rabbit_mnesia.erl @@ -69,7 +69,7 @@ init() -> case is_virgin_node() of true -> rabbit_log:info("Node database directory at ~ts is empty. " - "Assuming we need to join an existing cluster or initialise from scratch...~n", + "Assuming we need to join an existing cluster or initialise from scratch...", [dir()]), rabbit_peer_discovery:log_configured_backend(), rabbit_peer_discovery:maybe_init(), @@ -155,7 +155,7 @@ run_peer_discovery_with_retries(RetriesLeft, DelayInterval) -> e(invalid_cluster_nodes_conf) end, DiscoveredNodes = lists:usort(DiscoveredNodes0), - rabbit_log:info("All discovered existing cluster peers: ~s~n", + rabbit_log:info("All discovered existing cluster peers: ~s", [rabbit_peer_discovery:format_discovered_nodes(DiscoveredNodes)]), Peers = nodes_excl_me(DiscoveredNodes), case Peers of @@ -165,7 +165,7 @@ run_peer_discovery_with_retries(RetriesLeft, DelayInterval) -> "Enabling debug logging might help troubleshoot."), init_db_and_upgrade([node()], disc, false, _Retry = true); _ -> - rabbit_log:info("Peer nodes we can cluster with: ~s~n", + rabbit_log:info("Peer nodes we can cluster with: ~s", [rabbit_peer_discovery:format_discovered_nodes(Peers)]), join_discovered_peers(Peers, NodeType) end. @@ -180,13 +180,13 @@ join_discovered_peers(TryNodes, NodeType) -> join_discovered_peers_with_retries(TryNodes, _NodeType, 0, _DelayInterval) -> rabbit_log:warning( "Could not successfully contact any node of: ~s (as in Erlang distribution). " - "Starting as a blank standalone node...~n", + "Starting as a blank standalone node...", [string:join(lists:map(fun atom_to_list/1, TryNodes), ",")]), init_db_and_upgrade([node()], disc, false, _Retry = true); join_discovered_peers_with_retries(TryNodes, NodeType, RetriesLeft, DelayInterval) -> case find_reachable_peer_to_cluster_with(nodes_excl_me(TryNodes)) of {ok, Node} -> - rabbit_log:info("Node '~s' selected for auto-clustering~n", [Node]), + rabbit_log:info("Node '~s' selected for auto-clustering", [Node]), {ok, {_, DiscNodes, _}} = discover_cluster0(Node), init_db_and_upgrade(DiscNodes, NodeType, true, _Retry = true), rabbit_connection_tracking:boot(), @@ -237,7 +237,7 @@ join_cluster(DiscoveryNode, NodeType) -> reset_gracefully(), %% Join the cluster - rabbit_log:info("Clustering with ~p as ~p node~n", + rabbit_log:info("Clustering with ~p as ~p node", [ClusterNodes, NodeType]), ok = init_db_with_mnesia(ClusterNodes, NodeType, true, true, _Retry = true), @@ -252,7 +252,7 @@ join_cluster(DiscoveryNode, NodeType) -> %% do we think so ourselves? case are_we_clustered_with(DiscoveryNode) of true -> - rabbit_log:info("Asked to join a cluster but already a member of it: ~p~n", [ClusterNodes]), + rabbit_log:info("Asked to join a cluster but already a member of it: ~p", [ClusterNodes]), {ok, already_member}; false -> Msg = format_inconsistent_cluster_message(DiscoveryNode, node()), @@ -269,14 +269,14 @@ join_cluster(DiscoveryNode, NodeType) -> reset() -> ensure_mnesia_not_running(), - rabbit_log:info("Resetting Rabbit~n", []), + rabbit_log:info("Resetting Rabbit", []), reset_gracefully(). -spec force_reset() -> 'ok'. force_reset() -> ensure_mnesia_not_running(), - rabbit_log:info("Resetting Rabbit forcefully~n", []), + rabbit_log:info("Resetting Rabbit forcefully", []), wipe(). reset_gracefully() -> @@ -336,7 +336,7 @@ update_cluster_nodes(DiscoveryNode) -> %% nodes mnesia:delete_schema([node()]), rabbit_node_monitor:write_cluster_status(Status), - rabbit_log:info("Updating cluster nodes from ~p~n", + rabbit_log:info("Updating cluster nodes from ~p", [DiscoveryNode]), init_db_with_mnesia(AllNodes, node_type(), true, true, _Retry = false); false -> @@ -367,7 +367,7 @@ forget_cluster_node(Node, RemoveWhenOffline, EmitNodeDeletedEvent) -> {true, true} -> e(online_node_offline_flag); {false, false} -> e(offline_node_no_offline_flag); {false, true} -> rabbit_log:info( - "Removing node ~p from cluster~n", [Node]), + "Removing node ~p from cluster", [Node]), case remove_node_if_mnesia_running(Node) of ok when EmitNodeDeletedEvent -> rabbit_event:notify(node_deleted, [{node, Node}]), @@ -814,7 +814,7 @@ schema_ok_or_move() -> %% started yet rabbit_log:warning("schema integrity check failed: ~p~n" "moving database to backup location " - "and recreating schema from scratch~n", + "and recreating schema from scratch", [Reason]), ok = move_db(), ok = create_schema() @@ -848,7 +848,7 @@ move_db() -> ok -> %% NB: we cannot use rabbit_log here since it may not have %% been started yet - rabbit_log:warning("moved database from ~s to ~s~n", + rabbit_log:warning("moved database from ~s to ~s", [MnesiaDir, BackupDir]), ok; {error, Reason} -> throw({error, {cannot_backup_mnesia, @@ -895,7 +895,7 @@ leave_cluster(Node) -> end. wait_for(Condition) -> - rabbit_log:info("Waiting for ~p...~n", [Condition]), + rabbit_log:info("Waiting for ~p...", [Condition]), timer:sleep(1000). start_mnesia(CheckConsistency) -> @@ -1040,15 +1040,15 @@ find_reachable_peer_to_cluster_with([Node | Nodes]) -> end, case remote_node_info(Node) of {badrpc, _} = Reason -> - Fail("~p~n", [Reason]); + Fail("~p", [Reason]); %% old delegate hash check {_OTP, RMQ, Hash, _} when is_binary(Hash) -> - Fail("version ~s~n", [RMQ]); + Fail("version ~s", [RMQ]); {_OTP, _RMQ, _Protocol, {error, _} = E} -> - Fail("~p~n", [E]); + Fail("~p", [E]); {OTP, RMQ, Protocol, _} -> case check_consistency(Node, OTP, RMQ, Protocol) of - {error, _} -> Fail("versions ~p~n", + {error, _} -> Fail("versions ~p", [{OTP, RMQ}]); ok -> {ok, Node} end |