diff options
Diffstat (limited to 'deps/rabbit/src/rabbit_node_monitor.erl')
| -rw-r--r-- | deps/rabbit/src/rabbit_node_monitor.erl | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/deps/rabbit/src/rabbit_node_monitor.erl b/deps/rabbit/src/rabbit_node_monitor.erl index f71b84621f..43c4a4e22e 100644 --- a/deps/rabbit/src/rabbit_node_monitor.erl +++ b/deps/rabbit/src/rabbit_node_monitor.erl @@ -322,11 +322,11 @@ find_blocked_global_peers1([], _) -> unblock_global_peer(PeerNode) -> ThisNode = node(), PeerState = rpc:call(PeerNode, sys, get_status, [global_name_server]), - error_logger:info_msg( + logger:info( "Global hang workaround: global state on ~s seems broken~n" " * Peer global state: ~p~n" " * Local global state: ~p~n" - "Faking nodedown/nodeup between ~s and ~s~n", + "Faking nodedown/nodeup between ~s and ~s", [PeerNode, PeerState, sys:get_status(global_name_server), PeerNode, ThisNode]), {global_name_server, ThisNode} ! {nodedown, PeerNode}, @@ -434,7 +434,7 @@ handle_cast({check_partial_partition, Node, Rep, NodeGUID, MyGUID, RepGUID}, _ -> rabbit_log:warning("Received a 'DOWN' message" " from ~p but still can" - " communicate with it ~n", + " communicate with it ", [Node]), cast(Rep, {partial_partition, Node, node(), RepGUID}) @@ -468,7 +468,7 @@ handle_cast({partial_partition, NotReallyDown, Proxy, MyGUID}, {ok, pause_minority} -> rabbit_log:error( FmtBase ++ " * pause_minority mode enabled~n" - "We will therefore pause until the *entire* cluster recovers~n", + "We will therefore pause until the *entire* cluster recovers", ArgsBase), await_cluster_recovery(fun all_nodes_up/0), {noreply, State}; @@ -476,16 +476,16 @@ handle_cast({partial_partition, NotReallyDown, Proxy, MyGUID}, case in_preferred_partition(PreferredNodes) of true -> rabbit_log:error( FmtBase ++ "We will therefore intentionally " - "disconnect from ~s~n", ArgsBase ++ [Proxy]), + "disconnect from ~s", ArgsBase ++ [Proxy]), upgrade_to_full_partition(Proxy); false -> rabbit_log:info( FmtBase ++ "We are about to pause, no need " - "for further actions~n", ArgsBase) + "for further actions", ArgsBase) end, {noreply, State}; {ok, _} -> rabbit_log:error( - FmtBase ++ "We will therefore intentionally disconnect from ~s~n", + FmtBase ++ "We will therefore intentionally disconnect from ~s", ArgsBase ++ [Proxy]), upgrade_to_full_partition(Proxy), {noreply, State} @@ -498,7 +498,7 @@ handle_cast({partial_partition, _GUID, _Reporter, _Proxy}, State) -> %% messages reliably when another node disconnects from us. Therefore %% we are told just before the disconnection so we can reciprocate. handle_cast({partial_partition_disconnect, Other}, State) -> - rabbit_log:error("Partial partition disconnect from ~s~n", [Other]), + rabbit_log:error("Partial partition disconnect from ~s", [Other]), disconnect(Other), {noreply, State}; @@ -507,7 +507,7 @@ handle_cast({partial_partition_disconnect, Other}, State) -> %% mnesia propagation. handle_cast({node_up, Node, NodeType}, State = #state{monitors = Monitors}) -> - rabbit_log:info("rabbit on node ~p up~n", [Node]), + rabbit_log:info("rabbit on node ~p up", [Node]), {AllNodes, DiscNodes, RunningNodes} = read_cluster_status(), write_cluster_status({add_node(Node, AllNodes), case NodeType of @@ -551,7 +551,7 @@ handle_cast(_Msg, State) -> handle_info({'DOWN', _MRef, process, {rabbit, Node}, _Reason}, State = #state{monitors = Monitors, subscribers = Subscribers}) -> - rabbit_log:info("rabbit on node ~p down~n", [Node]), + rabbit_log:info("rabbit on node ~p down", [Node]), {AllNodes, DiscNodes, RunningNodes} = read_cluster_status(), write_cluster_status({AllNodes, DiscNodes, del_node(Node, RunningNodes)}), [P ! {node_down, Node} || P <- pmon:monitored(Subscribers)], @@ -565,7 +565,7 @@ handle_info({'DOWN', _MRef, process, Pid, _Reason}, handle_info({nodedown, Node, Info}, State = #state{guid = MyGUID, node_guids = GUIDs}) -> - rabbit_log:info("node ~p down: ~p~n", + rabbit_log:info("node ~p down: ~p", [Node, proplists:get_value(nodedown_reason, Info)]), Check = fun (N, CheckGUID, DownGUID) -> cast(N, {check_partial_partition, @@ -583,7 +583,7 @@ handle_info({nodedown, Node, Info}, State = #state{guid = MyGUID, {noreply, handle_dead_node(Node, State)}; handle_info({nodeup, Node, _Info}, State) -> - rabbit_log:info("node ~p up~n", [Node]), + rabbit_log:info("node ~p up", [Node]), {noreply, State}; handle_info({mnesia_system_event, @@ -687,13 +687,13 @@ handle_dead_node(Node, State = #state{autoheal = Autoheal}) -> State#state{autoheal = rabbit_autoheal:node_down(Node, Autoheal)}; {ok, Term} -> rabbit_log:warning("cluster_partition_handling ~p unrecognised, " - "assuming 'ignore'~n", [Term]), + "assuming 'ignore'", [Term]), State end. await_cluster_recovery(Condition) -> rabbit_log:warning("Cluster minority/secondary status detected - " - "awaiting recovery~n", []), + "awaiting recovery", []), run_outside_applications(fun () -> rabbit:stop(), wait_for_cluster_recovery(Condition) @@ -744,7 +744,7 @@ do_run_outside_app_fun(Fun) -> Fun() catch _:E:Stacktrace -> rabbit_log:error( - "rabbit_outside_app_process:~n~p~n~p~n", + "rabbit_outside_app_process:~n~p~n~p", [E, Stacktrace]) end. @@ -920,7 +920,7 @@ possibly_partitioned_nodes() -> alive_rabbit_nodes() -- rabbit_nodes:all_running(). startup_log([]) -> - rabbit_log:info("Starting rabbit_node_monitor~n", []); + rabbit_log:info("Starting rabbit_node_monitor", []); startup_log(Nodes) -> - rabbit_log:info("Starting rabbit_node_monitor, might be partitioned from ~p~n", + rabbit_log:info("Starting rabbit_node_monitor, might be partitioned from ~p", [Nodes]). |