diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-03-11 16:45:32 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-03-11 16:45:32 +0300 |
| commit | 777ad8549e54c5b015fd498bc2038fe3e10eb76b (patch) | |
| tree | 5ab1ed9836d887325fa4c875aa5ef14f4ff2c531 | |
| parent | 59103bf56069890b857df7bddf4e1790226c9b61 (diff) | |
| download | rabbitmq-server-git-use-builtin-logger.tar.gz | |
Drop trailing newlines from logged messages where possibleuse-builtin-logger
Lager strips trailing newline characters but OTP logger with the default
formatter adds a newline at the end. To avoid unintentional multi-line log
messages we have to revisit most messages logged.
Some log entries are intentionally multiline, others
are printed to stdout directly: newlines are required there
for sensible formatting.
100 files changed, 459 insertions, 471 deletions
diff --git a/deps/amqp10_client/src/amqp10_client_connection.erl b/deps/amqp10_client/src/amqp10_client_connection.erl index 023b3d8dc9..c56cde2c6e 100644 --- a/deps/amqp10_client/src/amqp10_client_connection.erl +++ b/deps/amqp10_client/src/amqp10_client_connection.erl @@ -228,7 +228,7 @@ hdr_sent(_EvtType, {protocol_header_received, 0, 1, 0, 0}, State) -> end; hdr_sent(_EvtType, {protocol_header_received, Protocol, Maj, Min, Rev}, State) -> - error_logger:warning_msg("Unsupported protocol version: ~b ~b.~b.~b~n", + logger:warning("Unsupported protocol version: ~b ~b.~b.~b", [Protocol, Maj, Min, Rev]), {stop, normal, State}; hdr_sent({call, From}, begin_session, @@ -291,7 +291,7 @@ opened(info, {'DOWN', MRef, _, _, _Info}, ok = notify_closed(Config, shutdown), {stop, normal, State}; opened(_EvtType, Frame, State) -> - error_logger:warning_msg("Unexpected connection frame ~p when in state ~p ~n", + logger:warning("Unexpected connection frame ~p when in state ~p ", [Frame, State]), {keep_state, State}. @@ -367,7 +367,7 @@ send_open(#state{socket = Socket, config = Config}) -> end, Encoded = amqp10_framing:encode_bin(Open), Frame = amqp10_binary_generator:build_frame(0, Encoded), - ?DBG("CONN <- ~p~n", [Open]), + ?DBG("CONN <- ~p", [Open]), socket_send(Socket, Frame). @@ -375,7 +375,7 @@ send_close(#state{socket = Socket}, _Reason) -> Close = #'v1_0.close'{}, Encoded = amqp10_framing:encode_bin(Close), Frame = amqp10_binary_generator:build_frame(0, Encoded), - ?DBG("CONN <- ~p~n", [Close]), + ?DBG("CONN <- ~p", [Close]), Ret = socket_send(Socket, Frame), case Ret of ok -> _ = @@ -397,7 +397,7 @@ send_sasl_init(State, {plain, User, Pass}) -> send(Record, FrameType, #state{socket = Socket}) -> Encoded = amqp10_framing:encode_bin(Record), Frame = amqp10_binary_generator:build_frame(0, FrameType, Encoded), - ?DBG("CONN <- ~p~n", [Record]), + ?DBG("CONN <- ~p", [Record]), socket_send(Socket, Frame). send_heartbeat(#state{socket = Socket}) -> diff --git a/deps/amqp10_client/src/amqp10_client_frame_reader.erl b/deps/amqp10_client/src/amqp10_client_frame_reader.erl index 01e1750352..5a0b83d0cf 100644 --- a/deps/amqp10_client/src/amqp10_client_frame_reader.erl +++ b/deps/amqp10_client/src/amqp10_client_frame_reader.erl @@ -158,16 +158,16 @@ handle_event(info, {Tcp, _, Packet}, StateName, #state{buffer = Buffer} = State) handle_event(info, {TcpError, _, Reason}, StateName, State) when TcpError == tcp_error orelse TcpError == ssl_error -> - error_logger:warning_msg("AMQP 1.0 connection socket errored, connection state: '~s', reason: '~p'~n", - [StateName, Reason]), + logger:warning("AMQP 1.0 connection socket errored, connection state: '~s', reason: '~p'", + [StateName, Reason]), State1 = State#state{socket = undefined, buffer = <<>>, frame_state = undefined}, {stop, {error, Reason}, State1}; handle_event(info, {TcpClosed, _}, StateName, State) when TcpClosed == tcp_closed orelse TcpClosed == ssl_closed -> - error_logger:warning_msg("AMQP 1.0 connection socket was closed, connection state: '~s'~n", - [StateName]), + logger:warning("AMQP 1.0 connection socket was closed, connection state: '~s'", + [StateName]), State1 = State#state{socket = undefined, buffer = <<>>, frame_state = undefined}, @@ -279,7 +279,7 @@ defer_heartbeat_timer(State) -> State. route_frame(Channel, FrameType, {Performative, Payload} = Frame, State0) -> {DestinationPid, State} = find_destination(Channel, FrameType, Performative, State0), - ?DBG("FRAME -> ~p ~p~n ~p~n", [Channel, DestinationPid, Performative]), + ?DBG("FRAME -> ~p ~p~n ~p", [Channel, DestinationPid, Performative]), case Payload of <<>> -> ok = gen_statem:cast(DestinationPid, Performative); _ -> ok = gen_statem:cast(DestinationPid, Frame) diff --git a/deps/amqp10_client/src/amqp10_client_session.erl b/deps/amqp10_client/src/amqp10_client_session.erl index 533db7526b..09a06fb3a6 100644 --- a/deps/amqp10_client/src/amqp10_client_session.erl +++ b/deps/amqp10_client/src/amqp10_client_session.erl @@ -372,7 +372,7 @@ mapped(cast, {#'v1_0.transfer'{handle = {uint, InHandle}, ok = notify_link(Link, credit_exhausted), {next_state, mapped, State}; {transfer_limit_exceeded, State} -> - error_logger:info_msg("transfer_limit_exceeded for link ~p~n", [Link]), + logger:warning("transfer_limit_exceeded for link ~p", [Link]), Link1 = detach_with_error_cond(Link, State, ?V_1_0_LINK_ERROR_TRANSFER_LIMIT_EXCEEDED), {next_state, mapped, update_link(Link1, State)} @@ -403,7 +403,7 @@ mapped(cast, #'v1_0.disposition'{role = true, settled = true, first = {uint, Fir {next_state, mapped, State#state{unsettled = Unsettled}}; mapped(cast, Frame, State) -> - error_logger:warning_msg("Unhandled session frame ~p in state ~p~n", + logger:warning("Unhandled session frame ~p in state ~p", [Frame, State]), {next_state, mapped, State}; mapped({call, From}, @@ -490,7 +490,7 @@ mapped({call, From}, Msg, State) -> {keep_state, State1, [{reply, From, Reply}]}; mapped(_EvtType, Msg, _State) -> - error_logger:info_msg("amqp10_session: unhandled msg in mapped state ~W", + logger:warning("amqp10_session: unhandled msg in mapped state ~W", [Msg, 10]), keep_state_and_data. diff --git a/deps/amqp_client/src/amqp_channel.erl b/deps/amqp_client/src/amqp_channel.erl index 256c5256a5..b00b43565d 100644 --- a/deps/amqp_client/src/amqp_channel.erl +++ b/deps/amqp_client/src/amqp_channel.erl @@ -511,7 +511,7 @@ handle_info({bump_credit, Msg}, State) -> %% @private handle_info(timed_out_flushing_channel, State) -> ?LOG_WARN("Channel (~p) closing: timed out flushing while " - "connection closing~n", [self()]), + "connection closing", [self()]), {stop, timed_out_flushing_channel, State}; %% @private handle_info({'DOWN', _, process, ReturnHandler, shutdown}, @@ -520,7 +520,7 @@ handle_info({'DOWN', _, process, ReturnHandler, shutdown}, handle_info({'DOWN', _, process, ReturnHandler, Reason}, State = #state{return_handler = {ReturnHandler, _Ref}}) -> ?LOG_WARN("Channel (~p): Unregistering return handler ~p because it died. " - "Reason: ~p~n", [self(), ReturnHandler, Reason]), + "Reason: ~p", [self(), ReturnHandler, Reason]), {noreply, State#state{return_handler = none}}; %% @private handle_info({'DOWN', _, process, ConfirmHandler, shutdown}, @@ -529,7 +529,7 @@ handle_info({'DOWN', _, process, ConfirmHandler, shutdown}, handle_info({'DOWN', _, process, ConfirmHandler, Reason}, State = #state{confirm_handler = {ConfirmHandler, _Ref}}) -> ?LOG_WARN("Channel (~p): Unregistering confirm handler ~p because it died. " - "Reason: ~p~n", [self(), ConfirmHandler, Reason]), + "Reason: ~p", [self(), ConfirmHandler, Reason]), {noreply, State#state{confirm_handler = none}}; %% @private handle_info({'DOWN', _, process, FlowHandler, shutdown}, @@ -538,7 +538,7 @@ handle_info({'DOWN', _, process, FlowHandler, shutdown}, handle_info({'DOWN', _, process, FlowHandler, Reason}, State = #state{flow_handler = {FlowHandler, _Ref}}) -> ?LOG_WARN("Channel (~p): Unregistering flow handler ~p because it died. " - "Reason: ~p~n", [self(), FlowHandler, Reason]), + "Reason: ~p", [self(), FlowHandler, Reason]), {noreply, State#state{flow_handler = none}}; handle_info({'DOWN', _, process, QPid, _Reason}, State) -> rabbit_amqqueue_common:notify_sent_queue_down(QPid), @@ -588,13 +588,13 @@ handle_method_to_server(Method, AmqpMsg, From, Sender, Flow, From, Sender, Flow, State1)}; {ok, none, BlockReply} -> ?LOG_WARN("Channel (~p): discarding method ~p in cast.~n" - "Reason: ~p~n", [self(), Method, BlockReply]), + "Reason: ~p", [self(), Method, BlockReply]), {noreply, State}; {ok, _, BlockReply} -> {reply, BlockReply, State}; {{_, InvalidMethodMessage}, none, _} -> ?LOG_WARN("Channel (~p): ignoring cast of ~p method. " ++ - InvalidMethodMessage ++ "~n", [self(), Method]), + InvalidMethodMessage ++ "", [self(), Method]), {noreply, State}; {{InvalidMethodReply, _}, _, _} -> {reply, {error, InvalidMethodReply}, State} @@ -695,7 +695,7 @@ safely_handle_method_from_server(Method, Content, _ -> false end, if Drop -> ?LOG_INFO("Channel (~p): dropping method ~p from " - "server because channel is closing~n", + "server because channel is closing", [self(), {Method, Content}]), {noreply, State}; true -> @@ -776,7 +776,7 @@ handle_method_from_server1( State = #state{return_handler = ReturnHandler}) -> case ReturnHandler of none -> ?LOG_WARN("Channel (~p): received {~p, ~p} but there is " - "no return handler registered~n", + "no return handler registered", [self(), BasicReturn, AmqpMsg]); {Pid, _Ref} -> Pid ! {BasicReturn, AmqpMsg} end, @@ -791,7 +791,7 @@ handle_method_from_server1(#'basic.ack'{} = BasicAck, none, handle_method_from_server1(#'basic.nack'{} = BasicNack, none, #state{confirm_handler = none} = State) -> ?LOG_WARN("Channel (~p): received ~p but there is no " - "confirm handler registered~n", [self(), BasicNack]), + "confirm handler registered", [self(), BasicNack]), {noreply, update_confirm_set(BasicNack, State)}; handle_method_from_server1(#'basic.nack'{} = BasicNack, none, #state{confirm_handler = {CH, _Ref}} = State) -> @@ -835,7 +835,7 @@ handle_connection_closing(CloseType, Reason, handle_channel_exit(Reason = #amqp_error{name = ErrorName, explanation = Expl}, State = #state{connection = Connection, number = Number}) -> %% Sent by rabbit_channel for hard errors in the direct case - ?LOG_ERR("connection ~p, channel ~p - error:~n~p~n", + ?LOG_ERR("connection ~p, channel ~p - error:~n~p", [Connection, Number, Reason]), {true, Code, _} = ?PROTOCOL:lookup_amqp_exception(ErrorName), ReportedReason = {server_initiated_close, Code, Expl}, @@ -928,7 +928,7 @@ server_misbehaved(#amqp_error{} = AmqpError, State = #state{number = Number}) -> handle_shutdown({server_misbehaved, AmqpError}, State); {_, Close} -> ?LOG_WARN("Channel (~p) flushing and closing due to soft " - "error caused by the server ~p~n", [self(), AmqpError]), + "error caused by the server ~p", [self(), AmqpError]), Self = self(), spawn(fun () -> call(Self, Close) end), {noreply, State} diff --git a/deps/amqp_client/src/amqp_channels_manager.erl b/deps/amqp_client/src/amqp_channels_manager.erl index 9a45497ed6..c435ba6502 100644 --- a/deps/amqp_client/src/amqp_channels_manager.erl +++ b/deps/amqp_client/src/amqp_channels_manager.erl @@ -203,7 +203,7 @@ internal_pass_frame(Number, Frame, State) -> case internal_lookup_npa(Number, State) of undefined -> ?LOG_INFO("Dropping frame ~p for invalid or closed " - "channel number ~p~n", [Frame, Number]), + "channel number ~p", [Frame, Number]), State; {ChPid, AState} -> NewAState = process_channel_frame(Frame, Number, ChPid, AState), diff --git a/deps/amqp_client/src/amqp_gen_connection.erl b/deps/amqp_client/src/amqp_gen_connection.erl index bfb897b916..3bd63996f1 100644 --- a/deps/amqp_client/src/amqp_gen_connection.erl +++ b/deps/amqp_client/src/amqp_gen_connection.erl @@ -203,7 +203,7 @@ handle_cast(channels_terminated, State) -> handle_cast({hard_error_in_channel, _Pid, Reason}, State) -> server_initiated_close(Reason, State); handle_cast({channel_internal_error, Pid, Reason}, State) -> - ?LOG_WARN("Connection (~p) closing: internal error in channel (~p): ~p~n", + ?LOG_WARN("Connection (~p) closing: internal error in channel (~p): ~p", [self(), Pid, Reason]), internal_error(Pid, Reason, State); handle_cast({server_misbehaved, AmqpError}, State) -> @@ -218,12 +218,12 @@ handle_cast({register_blocked_handler, HandlerPid}, State) -> handle_info({'DOWN', _, process, BlockHandler, Reason}, State = #state{block_handler = {BlockHandler, _Ref}}) -> ?LOG_WARN("Connection (~p): Unregistering connection.{blocked,unblocked} handler ~p because it died. " - "Reason: ~p~n", [self(), BlockHandler, Reason]), + "Reason: ~p", [self(), BlockHandler, Reason]), {noreply, State#state{block_handler = none}}; handle_info({'EXIT', BlockHandler, Reason}, State = #state{block_handler = {BlockHandler, Ref}}) -> ?LOG_WARN("Connection (~p): Unregistering connection.{blocked,unblocked} handler ~p because it died. " - "Reason: ~p~n", [self(), BlockHandler, Reason]), + "Reason: ~p", [self(), BlockHandler, Reason]), erlang:demonitor(Ref, [flush]), {noreply, State#state{block_handler = none}}; %% propagate the exit to the module that will stop with a sensible reason logged @@ -329,12 +329,12 @@ internal_error(Pid, Reason, State) -> server_initiated_close(Close, State) -> ?LOG_WARN("Connection (~p) closing: received hard error ~p " - "from server~n", [self(), Close]), + "from server", [self(), Close]), set_closing_state(abrupt, #closing{reason = server_initiated_close, close = Close}, State). server_misbehaved_close(AmqpError, State) -> - ?LOG_WARN("Connection (~p) closing: server misbehaved: ~p~n", + ?LOG_WARN("Connection (~p) closing: server misbehaved: ~p", [self(), AmqpError]), {0, Close} = rabbit_binary_generator:map_exception(0, AmqpError, ?PROTOCOL), set_closing_state(abrupt, #closing{reason = server_misbehaved, diff --git a/deps/amqp_client/src/amqp_ssl.erl b/deps/amqp_client/src/amqp_ssl.erl index de89547b55..b21a260aa2 100644 --- a/deps/amqp_client/src/amqp_ssl.erl +++ b/deps/amqp_client/src/amqp_ssl.erl @@ -54,8 +54,8 @@ maybe_add_verify(Options) -> % NB: user has explicitly set 'verify' Options; _ -> - ?LOG_WARN("Connection (~p): Certificate chain verification is not enabled for this TLS connection. " - "Please see https://rabbitmq.com/ssl.html for more information.~n", [self()]), + ?LOG_WARN("Connection (~p): certificate chain verification is not enabled for this TLS connection. " + "Please see https://rabbitmq.com/ssl.html for more information.", [self()]), Options end. diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl index de19a1fe8e..a58d6d93ed 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl @@ -107,7 +107,7 @@ sd_notify_socat(Socket) -> case sd_current_unit() of {ok, Unit} -> ?LOG_DEBUG( - ?LOG_PREFIX "systemd unit for activation check: \"~s\"~n", + ?LOG_PREFIX "systemd unit for activation check: \"~s\"", [Unit], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), sd_notify_socat(Socket, Unit); @@ -125,7 +125,7 @@ sd_notify_socat(Socket, Unit) -> catch Class:Reason -> ?LOG_DEBUG( - ?LOG_PREFIX "Failed to start socat(1): ~p:~p~n", + ?LOG_PREFIX "Failed to start socat(1): ~p:~p", [Class, Reason], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), false @@ -157,7 +157,7 @@ sd_wait_activation(Port, Unit) -> case os:find_executable("systemctl") of false -> ?LOG_DEBUG( - ?LOG_PREFIX "systemctl(1) unavailable, falling back to sleep~n", + ?LOG_PREFIX "systemctl(1) unavailable, falling back to sleep", [], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), timer:sleep(5000), @@ -168,7 +168,7 @@ sd_wait_activation(Port, Unit) -> sd_wait_activation(_, _, 0) -> ?LOG_DEBUG( - ?LOG_PREFIX "service still in 'activating' state, bailing out~n", + ?LOG_PREFIX "service still in 'activating' state, bailing out", [], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), ok; @@ -182,7 +182,7 @@ sd_wait_activation(Port, Unit, AttemptsLeft) -> ok; _ = Err -> ?LOG_DEBUG( - ?LOG_PREFIX "unexpected status from systemd: ~p~n", [Err], + ?LOG_PREFIX "unexpected status from systemd: ~p", [Err], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), ok end. diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl index 120b06a806..7db63e892c 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl @@ -204,7 +204,7 @@ generate_config_from_cuttlefish_files(Context, case SchemaFiles of [] -> ?LOG_ERROR( - "No configuration schema found~n", [], + "No configuration schema found", [], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), throw({error, no_configuration_schema_found}); _ -> diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_sighandler.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_sighandler.erl index f9a60effda..95f2916a8e 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_sighandler.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_sighandler.erl @@ -69,13 +69,13 @@ handle_event(Signal, State) -> %% which should stop RabbitMQ. % %#{Signal := stop} -> - % error_logger:info_msg( - % "~s received - shutting down~n", + % logger:info( + % "~s received - shutting down", % [string:uppercase(atom_to_list(Signal))]), % ok = init:stop(); _ -> - error_logger:info_msg( - "~s received - unhandled signal~n", + logger:info( + "~s received - unhandled signal", [string:uppercase(atom_to_list(Signal))]) end, {ok, State}. diff --git a/deps/rabbit/src/code_server_cache.erl b/deps/rabbit/src/code_server_cache.erl index 265d3a6f00..2eabc23b36 100644 --- a/deps/rabbit/src/code_server_cache.erl +++ b/deps/rabbit/src/code_server_cache.erl @@ -70,7 +70,7 @@ handle_maybe_call_mfa(true, {Module, Function, Args, Default}, State) -> error:undef -> handle_maybe_call_mfa_error(Module, Default, State); Err:Reason -> - rabbit_log:error("Calling ~p:~p failed: ~p:~p~n", + rabbit_log:error("Calling ~p:~p failed: ~p:~p", [Module, Function, Err, Reason]), handle_maybe_call_mfa_error(Module, Default, State) end. diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index 3e92de70d7..877891236e 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -830,14 +830,14 @@ start(normal, []) -> product_base_name := BaseName, product_base_version := BaseVersion} -> ?LOG_INFO( - "~n Starting ~s ~s on Erlang ~s~n Based on ~s ~s~n ~s~n ~s~n", + "~n Starting ~s ~s on Erlang ~s~n Based on ~s ~s~n ~s~n ~s", [product_name(), product_version(), rabbit_misc:otp_release(), BaseName, BaseVersion, ?COPYRIGHT_MESSAGE, ?INFORMATION_MESSAGE], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}); _ -> ?LOG_INFO( - "~n Starting ~s ~s on Erlang ~s~n ~s~n ~s~n", + "~n Starting ~s ~s on Erlang ~s~n ~s~n ~s", [product_name(), product_version(), rabbit_misc:otp_release(), ?COPYRIGHT_MESSAGE, ?INFORMATION_MESSAGE], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}) @@ -1230,7 +1230,7 @@ warn_if_kernel_config_dubious() -> true -> ok; false -> ?LOG_WARNING( "Kernel poll (epoll, kqueue, etc) is disabled. " - "Throughput and CPU utilization may worsen.~n", + "Throughput and CPU utilization may worsen.", #{domain => ?RMQLOG_DOMAIN_GLOBAL}) end end, @@ -1238,7 +1238,7 @@ warn_if_kernel_config_dubious() -> case DirtyIOSchedulers < ?DIRTY_IO_SCHEDULERS_WARNING_THRESHOLD of true -> ?LOG_WARNING( "Erlang VM is running with ~b dirty I/O schedulers, " - "file I/O performance may worsen~n", [DirtyIOSchedulers], + "file I/O performance may worsen", [DirtyIOSchedulers], #{domain => ?RMQLOG_DOMAIN_GLOBAL}); false -> ok end, @@ -1248,7 +1248,7 @@ warn_if_kernel_config_dubious() -> end, case proplists:get_value(nodelay, IDCOpts, false) of false -> ?LOG_WARNING("Nagle's algorithm is enabled for sockets, " - "network I/O latency will be higher~n", + "network I/O latency will be higher", #{domain => ?RMQLOG_DOMAIN_GLOBAL}); true -> ok end. @@ -1278,7 +1278,7 @@ validate_msg_store_io_batch_size_and_credit_disc_bound(CreditDiscBound, if IoBatchSize < ?IO_BATCH_SIZE -> throw({error, {"io_batch_size of ~b lower than recommended value ~b, " - "paging performance may worsen~n", + "paging performance may worsen", [IoBatchSize, ?IO_BATCH_SIZE]}}); true -> ok @@ -1299,7 +1299,7 @@ validate_msg_store_io_batch_size_and_credit_disc_bound(CreditDiscBound, throw({error, {"msg_store_credit_disc_bound {~b, ~b} lower than" "recommended value {~b, ~b}," - " paging performance may worsen~n", + " paging performance may worsen", [IC, MCA, RIC, RMCA]}}); true -> ok @@ -1327,7 +1327,7 @@ validate_msg_store_io_batch_size_and_credit_disc_bound(CreditDiscBound, {error, {"msg_store_io_batch_size ~b should be bigger than the initial " "credit value from msg_store_credit_disc_bound ~b," - " paging performance may worsen~n", + " paging performance may worsen", [IoBatchSize, InitialCredit]}}); true -> ok @@ -1505,9 +1505,9 @@ ensure_working_fhc() -> {ok, true} -> "ON"; {ok, false} -> "OFF" end, - ?LOG_INFO("FHC read buffering: ~s~n", [ReadBuf], + ?LOG_INFO("FHC read buffering: ~s", [ReadBuf], #{domain => ?RMQLOG_DOMAIN_GLOBAL}), - ?LOG_INFO("FHC write buffering: ~s~n", [WriteBuf], + ?LOG_INFO("FHC write buffering: ~s", [WriteBuf], #{domain => ?RMQLOG_DOMAIN_GLOBAL}), Filename = filename:join(code:lib_dir(kernel, ebin), "kernel.app"), {ok, Fd} = file_handle_cache:open(Filename, [raw, binary, read], []), diff --git a/deps/rabbit/src/rabbit_access_control.erl b/deps/rabbit/src/rabbit_access_control.erl index f724970409..5c5de6822e 100644 --- a/deps/rabbit/src/rabbit_access_control.erl +++ b/deps/rabbit/src/rabbit_access_control.erl @@ -85,7 +85,7 @@ try_authenticate(Module, Username, AuthProps) -> case Module:user_login_authentication(Username, AuthProps) of {ok, AuthUser} -> {ok, AuthUser}; {error, E} -> {refused, Username, - "~s failed authenticating ~s: ~p~n", + "~s failed authenticating ~s: ~p", [Module, Username, E]}; {refused, F, A} -> {refused, Username, F, A} end. @@ -97,7 +97,7 @@ try_authorize(Modules, Username, AuthProps) -> {ok, Impl, Tags}-> {ok, [{Module, Impl} | ModsImpls], ModsTags ++ Tags}; {ok, Impl} -> {ok, [{Module, Impl} | ModsImpls], ModsTags}; {error, E} -> {refused, Username, - "~s failed authorizing ~s: ~p~n", + "~s failed authorizing ~s: ~p", [Module, Username, E]}; {refused, F, A} -> {refused, Username, F, A} end; @@ -215,7 +215,7 @@ check_access(Fun, Module, ErrStr, ErrArgs, ErrName) -> false -> rabbit_misc:protocol_error(ErrName, ErrStr, ErrArgs); {error, E} -> - FullErrStr = ErrStr ++ ", backend ~s returned an error: ~p~n", + FullErrStr = ErrStr ++ ", backend ~s returned an error: ~p", FullErrArgs = ErrArgs ++ [Module, E], rabbit_log:error(FullErrStr, FullErrArgs), rabbit_misc:protocol_error(ErrName, FullErrStr, FullErrArgs) diff --git a/deps/rabbit/src/rabbit_alarm.erl b/deps/rabbit/src/rabbit_alarm.erl index 5cc25bd1f1..e9942136a9 100644 --- a/deps/rabbit/src/rabbit_alarm.erl +++ b/deps/rabbit/src/rabbit_alarm.erl @@ -232,7 +232,7 @@ handle_event({node_down, Node}, #alarms{alarmed_nodes = AN} = State) -> error -> [] end, {ok, lists:foldr(fun(Source, AccState) -> - rabbit_log:warning("~s resource limit alarm cleared for dead node ~p~n", + rabbit_log:warning("~s resource limit alarm cleared for dead node ~p", [Source, Node]), maybe_alert(fun dict_unappend/3, Node, Source, false, AccState) end, State, AlarmsForDeadNode)}; @@ -284,7 +284,7 @@ maybe_alert(UpdateFun, Node, Source, WasAlertAdded, StillHasAlerts = lists:any(fun ({_Node, NodeAlerts}) -> lists:member(Source, NodeAlerts) end, dict:to_list(AN1)), case StillHasAlerts of true -> ok; - false -> rabbit_log:warning("~s resource limit alarm cleared across the cluster~n", [Source]) + false -> rabbit_log:warning("~s resource limit alarm cleared across the cluster", [Source]) end, Alert = {WasAlertAdded, StillHasAlerts, Node}, case node() of @@ -336,11 +336,11 @@ handle_set_alarm({file_descriptor_limit, []}, State) -> "********************************************************************~n"), {ok, State}; handle_set_alarm(Alarm, State) -> - rabbit_log:warning("alarm '~p' set~n", [Alarm]), + rabbit_log:warning("alarm '~p' set", [Alarm]), {ok, State}. handle_clear_resource_alarm(Source, Node, State) -> - rabbit_log:warning("~s resource limit alarm cleared on node ~p~n", + rabbit_log:warning("~s resource limit alarm cleared on node ~p", [Source, Node]), {ok, maybe_alert(fun dict_unappend/3, Node, Source, false, State)}. @@ -348,7 +348,7 @@ handle_clear_alarm(file_descriptor_limit, State) -> rabbit_log:warning("file descriptor limit alarm cleared~n"), {ok, State}; handle_clear_alarm(Alarm, State) -> - rabbit_log:warning("alarm '~p' cleared~n", [Alarm]), + rabbit_log:warning("alarm '~p' cleared", [Alarm]), {ok, State}. is_node_alarmed(Source, Node, #alarms{alarmed_nodes = AN}) -> diff --git a/deps/rabbit/src/rabbit_amqqueue.erl b/deps/rabbit/src/rabbit_amqqueue.erl index 5a3a60377c..fa565bcf5b 100644 --- a/deps/rabbit/src/rabbit_amqqueue.erl +++ b/deps/rabbit/src/rabbit_amqqueue.erl @@ -111,7 +111,7 @@ warn_file_limit() -> case file_handle_cache:get_limit() < L of true -> rabbit_log:warning( - "Recovering ~p queues, available file handles: ~p. Please increase max open file handles limit to at least ~p!~n", + "Recovering ~p queues, available file handles: ~p. Please increase max open file handles limit to at least ~p!", [L, file_handle_cache:get_limit(), L]); false -> ok @@ -626,7 +626,7 @@ retry_wait(Q, F, E, RetriesLeft) -> % The old check would have crashed here, % instead, log it and run the exit fun. absent & alive is weird, % but better than crashing with badmatch,true - rabbit_log:debug("Unexpected alive queue process ~p~n", [QPid]), + rabbit_log:debug("Unexpected alive queue process ~p", [QPid]), E({absent, Q, alive}); false -> ok % Expected result @@ -1234,7 +1234,7 @@ count(VHost) -> %% that requires a proper consensus algorithm. length(list_for_count(VHost)) catch _:Err -> - rabbit_log:error("Failed to fetch number of queues in vhost ~p:~n~p~n", + rabbit_log:error("Failed to fetch number of queues in vhost ~p:~n~p", [VHost, Err]), 0 end. diff --git a/deps/rabbit/src/rabbit_auth_backend_internal.erl b/deps/rabbit/src/rabbit_auth_backend_internal.erl index 3529a8099d..dcf4fd3a8c 100644 --- a/deps/rabbit/src/rabbit_auth_backend_internal.erl +++ b/deps/rabbit/src/rabbit_auth_backend_internal.erl @@ -197,7 +197,7 @@ validate_and_alternate_credentials(Username, Password, ActingUser, Fun) -> ok -> Fun(Username, Password, ActingUser); {error, Err} -> - rabbit_log:error("Credential validation for '~s' failed!~n", [Username]), + rabbit_log:error("Credential validation for '~s' failed!", [Username]), {error, Err} end. @@ -334,7 +334,7 @@ change_password_sans_validation(Username, Password, ActingUser) -> -spec clear_password(rabbit_types:username(), rabbit_types:username()) -> 'ok'. clear_password(Username, ActingUser) -> - rabbit_log:info("Clearing password for '~s'~n", [Username]), + rabbit_log:info("Clearing password for '~s'", [Username]), R = change_password_hash(Username, <<"">>), rabbit_event:notify(user_password_cleared, [{name, Username}, diff --git a/deps/rabbit/src/rabbit_autoheal.erl b/deps/rabbit/src/rabbit_autoheal.erl index 670e0e3330..ae2888c9f7 100644 --- a/deps/rabbit/src/rabbit_autoheal.erl +++ b/deps/rabbit/src/rabbit_autoheal.erl @@ -118,7 +118,7 @@ init() -> case State of {leader_waiting, Winner, _} -> rabbit_log:info( - "Autoheal: in progress, requesting report from ~p~n", [Winner]), + "Autoheal: in progress, requesting report from ~p", [Winner]), send(Winner, report_autoheal_status); _ -> ok @@ -129,7 +129,7 @@ maybe_start(not_healing) -> case enabled() of true -> Leader = leader(), send(Leader, {request_start, node()}), - rabbit_log:info("Autoheal request sent to ~p~n", [Leader]), + rabbit_log:info("Autoheal request sent to ~p", [Leader]), not_healing; false -> not_healing end; @@ -150,7 +150,7 @@ leader() -> %% This is the winner receiving its last notification that a node has %% stopped - all nodes can now start again rabbit_down(Node, {winner_waiting, [Node], Notify}) -> - rabbit_log:info("Autoheal: final node has stopped, starting...~n",[]), + rabbit_log:info("Autoheal: final node has stopped, starting...",[]), winner_finish(Notify); rabbit_down(Node, {winner_waiting, WaitFor, Notify}) -> @@ -173,25 +173,25 @@ node_down(Node, {winner_waiting, _, Notify}) -> node_down(Node, {leader_waiting, Node, _Notify}) -> %% The winner went down, we don't know what to do so we simply abort. - rabbit_log:info("Autoheal: aborting - winner ~p went down~n", [Node]), + rabbit_log:info("Autoheal: aborting - winner ~p went down", [Node]), not_healing; node_down(Node, {leader_waiting, _, _} = St) -> %% If it is a partial partition, the winner might continue with the %% healing process. If it is a full partition, the winner will also %% see it and abort. Let's wait for it. - rabbit_log:info("Autoheal: ~p went down, waiting for winner decision ~n", [Node]), + rabbit_log:info("Autoheal: ~p went down, waiting for winner decision ", [Node]), St; node_down(Node, _State) -> - rabbit_log:info("Autoheal: aborting - ~p went down~n", [Node]), + rabbit_log:info("Autoheal: aborting - ~p went down", [Node]), not_healing. %% If the process that has to restart the node crashes for an unexpected reason, %% we go back to a not healing state so the node is able to recover. process_down({'EXIT', Pid, Reason}, {restarting, Pid}) when Reason =/= normal -> rabbit_log:info("Autoheal: aborting - the process responsible for restarting the " - "node terminated with reason: ~p~n", [Reason]), + "node terminated with reason: ~p", [Reason]), not_healing; process_down(_, State) -> @@ -201,17 +201,17 @@ process_down(_, State) -> %% TODO should we try to debounce this? handle_msg({request_start, Node}, not_healing, Partitions) -> - rabbit_log:info("Autoheal request received from ~p~n", [Node]), + rabbit_log:info("Autoheal request received from ~p", [Node]), case check_other_nodes(Partitions) of {error, E} -> - rabbit_log:info("Autoheal request denied: ~s~n", [fmt_error(E)]), + rabbit_log:info("Autoheal request denied: ~s", [fmt_error(E)]), not_healing; {ok, AllPartitions} -> {Winner, Losers} = make_decision(AllPartitions), rabbit_log:info("Autoheal decision~n" " * Partitions: ~p~n" " * Winner: ~p~n" - " * Losers: ~p~n", + " * Losers: ~p", [AllPartitions, Winner, Losers]), case node() =:= Winner of true -> handle_msg({become_winner, Losers}, @@ -224,12 +224,12 @@ handle_msg({request_start, Node}, handle_msg({request_start, Node}, State, _Partitions) -> rabbit_log:info("Autoheal request received from ~p when healing; " - "ignoring~n", [Node]), + "ignoring", [Node]), State; handle_msg({become_winner, Losers}, not_healing, _Partitions) -> - rabbit_log:info("Autoheal: I am the winner, waiting for ~p to stop~n", + rabbit_log:info("Autoheal: I am the winner, waiting for ~p to stop", [Losers]), stop_partition(Losers); @@ -238,7 +238,7 @@ handle_msg({become_winner, Losers}, %% The leader has aborted the healing, might have seen us down but %% we didn't see the same. Let's try again as it is the same partition. rabbit_log:info("Autoheal: I am the winner and received a duplicated " - "request, waiting again for ~p to stop~n", [Losers]), + "request, waiting again for ~p to stop", [Losers]), stop_partition(Losers); handle_msg({become_winner, _}, @@ -246,7 +246,7 @@ handle_msg({become_winner, _}, %% Something has happened to the leader, it might have seen us down but we %% are still alive. Partitions have changed, cannot continue. rabbit_log:info("Autoheal: I am the winner and received another healing " - "request, partitions have changed to ~p. Aborting ~n", [Losers]), + "request, partitions have changed to ~p. Aborting ", [Losers]), winner_finish(Losers), not_healing; @@ -264,7 +264,7 @@ handle_msg({winner_is, Winner}, State = {leader_waiting, Winner, _}, handle_msg(Request, {restarting, Pid} = St, _Partitions) -> %% ignore, we can contribute no further rabbit_log:info("Autoheal: Received the request ~p while waiting for ~p " - "to restart the node. Ignoring it ~n", [Request, Pid]), + "to restart the node. Ignoring it ", [Request, Pid]), St; handle_msg(report_autoheal_status, not_healing, _Partitions) -> @@ -286,14 +286,14 @@ handle_msg({autoheal_finished, Winner}, %% The winner is finished with the autoheal process and notified us %% (the leader). We can transition to the "not_healing" state and %% accept new requests. - rabbit_log:info("Autoheal finished according to winner ~p~n", [Winner]), + rabbit_log:info("Autoheal finished according to winner ~p", [Winner]), not_healing; handle_msg({autoheal_finished, Winner}, not_healing, _Partitions) when Winner =:= node() -> %% We are the leader and the winner. The state already transitioned %% to "not_healing" at the end of the autoheal process. - rabbit_log:info("Autoheal finished according to winner ~p~n", [node()]), + rabbit_log:info("Autoheal finished according to winner ~p", [node()]), not_healing; handle_msg({autoheal_finished, Winner}, not_healing, _Partitions) -> @@ -301,7 +301,7 @@ handle_msg({autoheal_finished, Winner}, not_healing, _Partitions) -> %% transitioned to not_healing. However, the winner was still able %% to finish. Let it pass. rabbit_log:info("Autoheal finished according to winner ~p." - " Unexpected, I might have previously seen the winner down~n", [Winner]), + " Unexpected, I might have previously seen the winner down", [Winner]), not_healing. %%---------------------------------------------------------------------------- @@ -309,7 +309,7 @@ handle_msg({autoheal_finished, Winner}, not_healing, _Partitions) -> send(Node, Msg) -> {?SERVER, Node} ! {autoheal_msg, Msg}. abort(Down, Notify) -> - rabbit_log:info("Autoheal: aborting - ~p down~n", [Down]), + rabbit_log:info("Autoheal: aborting - ~p down", [Down]), %% Make sure any nodes waiting for us start - it won't necessarily %% heal the partition but at least they won't get stuck. %% If we are executing this, we are not stopping. Thus, don't wait @@ -354,15 +354,14 @@ wait_for_supervisors(Monitors) -> 60000 -> AliveLosers = [Node || {_, Node} <- pmon:monitored(Monitors)], rabbit_log:info("Autoheal: mnesia in nodes ~p is still up, sending " - "winner notification again to these ~n", [AliveLosers]), + "winner notification again to these ", [AliveLosers]), [send(L, {winner_is, node()}) || L <- AliveLosers], wait_for_mnesia_shutdown(AliveLosers) end end. restart_loser(State, Winner) -> - rabbit_log:warning( - "Autoheal: we were selected to restart; winner is ~p~n", [Winner]), + rabbit_log:warning("Autoheal: we were selected to restart; winner is ~p", [Winner]), NextStateTimeout = application:get_env(rabbit, autoheal_state_transition_timeout, 60000), rabbit_node_monitor:run_outside_applications( fun () -> diff --git a/deps/rabbit/src/rabbit_channel.erl b/deps/rabbit/src/rabbit_channel.erl index 998b450930..6356b76f3c 100644 --- a/deps/rabbit/src/rabbit_channel.erl +++ b/deps/rabbit/src/rabbit_channel.erl @@ -948,7 +948,7 @@ handle_exception(Reason, State = #ch{cfg = #conf{protocol = Protocol, {Channel, CloseMethod} -> rabbit_log_channel:error( "Channel error on connection ~p (~s, vhost: '~s'," - " user: '~s'), channel ~p:~n~s~n", + " user: '~s'), channel ~p:~n~s", [ConnPid, ConnName, VHost, User#user.username, Channel, format_soft_error(Reason)]), ok = rabbit_writer:send_command(WriterPid, CloseMethod), diff --git a/deps/rabbit/src/rabbit_channel_interceptor.erl b/deps/rabbit/src/rabbit_channel_interceptor.erl index 809c27bc8a..9a68f50d5d 100644 --- a/deps/rabbit/src/rabbit_channel_interceptor.erl +++ b/deps/rabbit/src/rabbit_channel_interceptor.erl @@ -53,8 +53,7 @@ check_no_overlap1(Sets) -> case sets:size(Is) of 0 -> ok; _ -> - internal_error("Interceptor: more than one " - "module handles ~p~n", [Is]) + internal_error("Interceptor: more than one module handles ~p", [Is]) end, sets:union(Set, Union) end, diff --git a/deps/rabbit/src/rabbit_channel_tracking.erl b/deps/rabbit/src/rabbit_channel_tracking.erl index d7aedfa175..b122e2b543 100644 --- a/deps/rabbit/src/rabbit_channel_tracking.erl +++ b/deps/rabbit/src/rabbit_channel_tracking.erl @@ -99,7 +99,7 @@ handle_cast({connection_closed, ConnDetails}) -> case pget(node, ConnDetails) of ThisNode -> TrackedChs = get_tracked_channels_by_connection_pid(ConnPid), - rabbit_log_connection:info( + rabbit_log_channel:info( "Closing all channels from connection '~s' " "because it has been closed", [pget(name, ConnDetails)]), %% Shutting down channels will take care of unregistering the @@ -117,7 +117,7 @@ handle_cast({user_deleted, Details}) -> ok; handle_cast({node_deleted, Details}) -> Node = pget(node, Details), - rabbit_log_connection:info( + rabbit_log_channel:info( "Node '~s' was removed from the cluster, deleting" " its channel tracking tables...", [Node]), delete_tracked_channels_table_for_node(Node), diff --git a/deps/rabbit/src/rabbit_classic_queue.erl b/deps/rabbit/src/rabbit_classic_queue.erl index 91cfde038f..c5c9aabd0c 100644 --- a/deps/rabbit/src/rabbit_classic_queue.erl +++ b/deps/rabbit/src/rabbit_classic_queue.erl @@ -437,7 +437,7 @@ recover_durable_queues(QueuesAndRecoveryTerms) -> gen_server2:mcall( [{rabbit_amqqueue_sup_sup:start_queue_process(node(), Q, recovery), {init, {self(), Terms}}} || {Q, Terms} <- QueuesAndRecoveryTerms]), - [rabbit_log:error("Queue ~p failed to initialise: ~p~n", + [rabbit_log:error("Queue ~p failed to initialise: ~p", [Pid, Error]) || {Pid, Error} <- Failures], [Q || {_, {new, Q}} <- Results]. diff --git a/deps/rabbit/src/rabbit_dead_letter.erl b/deps/rabbit/src/rabbit_dead_letter.erl index 8c91356b69..74ce2d6af7 100644 --- a/deps/rabbit/src/rabbit_dead_letter.erl +++ b/deps/rabbit/src/rabbit_dead_letter.erl @@ -140,7 +140,7 @@ update_x_death_header(Info, Headers) -> [{table, rabbit_misc:sort_field_table(Info1)} | Others]); {<<"x-death">>, InvalidType, Header} -> rabbit_log:warning("Message has invalid x-death header (type: ~p)." - " Resetting header ~p~n", + " Resetting header ~p", [InvalidType, Header]), %% if x-death is something other than an array (list) %% then we reset it: this happens when some clients consume @@ -247,7 +247,7 @@ log_cycle_once(Queues) -> true -> ok; undefined -> rabbit_log:warning( "Message dropped. Dead-letter queues cycle detected" ++ - ": ~p~nThis cycle will NOT be reported again.~n", + ": ~p~nThis cycle will NOT be reported again.", [Queues]), put(Key, true) end. diff --git a/deps/rabbit/src/rabbit_disk_monitor.erl b/deps/rabbit/src/rabbit_disk_monitor.erl index 4f7f640756..7da548e351 100644 --- a/deps/rabbit/src/rabbit_disk_monitor.erl +++ b/deps/rabbit/src/rabbit_disk_monitor.erl @@ -199,7 +199,7 @@ dir() -> rabbit_mnesia:dir(). set_disk_limits(State, Limit0) -> Limit = interpret_limit(Limit0), State1 = State#state { limit = Limit }, - rabbit_log:info("Disk free limit set to ~pMB~n", + rabbit_log:info("Disk free limit set to ~pMB", [trunc(Limit / 1000000)]), internal_update(State1). @@ -283,7 +283,7 @@ interpret_limit(Absolute) -> emit_update_info(StateStr, CurrentFree, Limit) -> rabbit_log:info( - "Free disk space is ~s. Free bytes: ~p. Limit: ~p~n", + "Free disk space is ~s. Free bytes: ~p. Limit: ~p", [StateStr, CurrentFree, Limit]). start_timer(State) -> @@ -306,11 +306,11 @@ enable(#state{dir = Dir, interval = Interval, limit = Limit, retries = Retries} case {catch get_disk_free(Dir), vm_memory_monitor:get_total_memory()} of {N1, N2} when is_integer(N1), is_integer(N2) -> - rabbit_log:info("Enabling free disk space monitoring~n", []), + rabbit_log:info("Enabling free disk space monitoring", []), start_timer(set_disk_limits(State, Limit)); Err -> rabbit_log:info("Free disk space monitor encountered an error " - "(e.g. failed to parse output from OS tools): ~p, retries left: ~b~n", + "(e.g. failed to parse output from OS tools): ~p, retries left: ~b", [Err, Retries]), erlang:send_after(Interval, self(), try_enable), State#state{enabled = false} diff --git a/deps/rabbit/src/rabbit_epmd_monitor.erl b/deps/rabbit/src/rabbit_epmd_monitor.erl index 70aa9e0f11..46cb7f91ef 100644 --- a/deps/rabbit/src/rabbit_epmd_monitor.erl +++ b/deps/rabbit/src/rabbit_epmd_monitor.erl @@ -86,10 +86,10 @@ check_epmd(State = #state{mod = Mod, {ok, State#state{port = Port1}}. handle_port_please(init, noport, Me, Port) -> - rabbit_log:info("epmd does not know us, re-registering as ~s~n", [Me]), + rabbit_log:info("epmd does not know us, re-registering as ~s", [Me]), {ok, Port}; handle_port_please(check, noport, Me, Port) -> - rabbit_log:warning("epmd does not know us, re-registering ~s at port ~b~n", [Me, Port]), + rabbit_log:warning("epmd does not know us, re-registering ~s at port ~b", [Me, Port]), {ok, Port}; handle_port_please(_, closed, _Me, Port) -> rabbit_log:error("epmd monitor failed to retrieve our port from epmd: closed"), diff --git a/deps/rabbit/src/rabbit_exchange.erl b/deps/rabbit/src/rabbit_exchange.erl index 3e50f6136d..5a1447a427 100644 --- a/deps/rabbit/src/rabbit_exchange.erl +++ b/deps/rabbit/src/rabbit_exchange.erl @@ -574,7 +574,7 @@ peek_serial(XName, LockType) -> end. invalid_module(T) -> - rabbit_log:warning("Could not find exchange type ~s.~n", [T]), + rabbit_log:warning("Could not find exchange type ~s.", [T]), put({xtype_to_module, T}, rabbit_exchange_type_invalid), rabbit_exchange_type_invalid. diff --git a/deps/rabbit/src/rabbit_fifo_client.erl b/deps/rabbit/src/rabbit_fifo_client.erl index ab23988b2d..7ac1d7ba6e 100644 --- a/deps/rabbit/src/rabbit_fifo_client.erl +++ b/deps/rabbit/src/rabbit_fifo_client.erl @@ -682,7 +682,6 @@ maybe_add_action(Action, Acc, State) -> {[Action | Acc], State}. do_resends(From, To, State) when From =< To -> - % ?INFO("rabbit_fifo_client: doing resends From ~w To ~w~n", [From, To]), lists:foldl(fun resend/2, State, lists:seq(From, To)); do_resends(_, _, State) -> State. diff --git a/deps/rabbit/src/rabbit_mirror_queue_master.erl b/deps/rabbit/src/rabbit_mirror_queue_master.erl index 4200413fc6..370a11af2b 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_master.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_master.erl @@ -150,7 +150,7 @@ sync_mirrors(HandleInfo, EmitStats, backing_queue_state = BQS }) -> Log = fun (Fmt, Params) -> rabbit_mirror_queue_misc:log_info( - QName, "Synchronising: " ++ Fmt ++ "~n", Params) + QName, "Synchronising: " ++ Fmt ++ "", Params) end, Log("~p messages to synchronise", [BQ:len(BQS)]), {ok, Q} = rabbit_amqqueue:lookup(QName), @@ -198,7 +198,7 @@ terminate(Reason, true -> %% Remove the whole queue to avoid data loss rabbit_mirror_queue_misc:log_warning( QName, "Stopping all nodes on master shutdown since no " - "synchronised mirror (replica) is available~n", []), + "synchronised mirror (replica) is available", []), stop_all_slaves(Reason, State); false -> %% Just let some other mirror take over. ok diff --git a/deps/rabbit/src/rabbit_mirror_queue_misc.erl b/deps/rabbit/src/rabbit_mirror_queue_misc.erl index c3fbeaba57..7775489309 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_misc.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_misc.erl @@ -211,7 +211,7 @@ drop_mirror(QName, MirrorNode) -> [PrimaryPid] when MirrorPids =:= [] -> {error, cannot_drop_only_mirror}; [Pid] -> - log_info(Name, "Dropping queue mirror on node ~p~n", + log_info(Name, "Dropping queue mirror on node ~p", [MirrorNode]), exit(Pid, {shutdown, dropped}), {ok, dropped} @@ -238,7 +238,7 @@ add_mirror(QName, MirrorNode, SyncMode) -> {ok, _} -> try MirrorPid = rabbit_amqqueue_sup_sup:start_queue_process(MirrorNode, Q, slave), - log_info(QName, "Adding mirror on node ~p: ~p~n", [MirrorNode, MirrorPid]), + log_info(QName, "Adding mirror on node ~p: ~p", [MirrorNode, MirrorPid]), rabbit_mirror_queue_slave:go(MirrorPid, SyncMode) of _ -> ok @@ -246,13 +246,13 @@ add_mirror(QName, MirrorNode, SyncMode) -> error:QError -> log_warning(QName, "Unable to start queue mirror on node '~p'. " - "Target queue supervisor is not running: ~p~n", + "Target queue supervisor is not running: ~p", [MirrorNode, QError]) end; {error, Error} -> log_warning(QName, "Unable to start queue mirror on node '~p'. " - "Target virtual host is not running: ~p~n", + "Target virtual host is not running: ~p", [MirrorNode, Error]), ok end @@ -264,7 +264,7 @@ add_mirror(QName, MirrorNode, SyncMode) -> report_deaths(_MirrorPid, _IsMaster, _QueueName, []) -> ok; report_deaths(MirrorPid, IsMaster, QueueName, DeadPids) -> - log_info(QueueName, "~s replica of queue ~s detected replica ~s to be down~n", + log_info(QueueName, "~s replica of queue ~s detected replica ~s to be down", [case IsMaster of true -> "Primary"; false -> "Secondary" @@ -342,7 +342,7 @@ stop_all_slaves(Reason, SPids, QName, GM, WaitTimeout) -> after WaitTimeout -> rabbit_mirror_queue_misc:log_warning( QName, "Missing 'DOWN' message from ~p in" - " node ~p~n", [Pid, node(Pid)]), + " node ~p", [Pid, node(Pid)]), [Pid | Acc] end; false -> diff --git a/deps/rabbit/src/rabbit_mirror_queue_slave.erl b/deps/rabbit/src/rabbit_mirror_queue_slave.erl index 6ba390212f..27f610d0b9 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_slave.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_slave.erl @@ -137,7 +137,7 @@ handle_go(Q0) when ?is_amqqueue(Q0) -> {ok, State}; {stale, StalePid} -> rabbit_mirror_queue_misc:log_warning( - QName, "Detected stale HA master: ~p~n", [StalePid]), + QName, "Detected stale classic mirrored queue leader: ~p", [StalePid]), gm:leave(GM), {error, {stale_master_pid, StalePid}}; duplicate_live_master -> @@ -189,7 +189,7 @@ init_it(Self, GM, Node, QName) -> stop_pending_slaves(QName, Pids) -> [begin rabbit_mirror_queue_misc:log_warning( - QName, "Detected a non-responsive classic queue mirror, stopping it: ~p~n", [Pid]), + QName, "Detected a non-responsive classic queue mirror, stopping it: ~p", [Pid]), case erlang:process_info(Pid, dictionary) of undefined -> ok; {dictionary, Dict} -> @@ -633,7 +633,7 @@ promote_me(From, #state { q = Q0, msg_id_status = MS, known_senders = KS}) when ?is_amqqueue(Q0) -> QName = amqqueue:get_name(Q0), - rabbit_mirror_queue_misc:log_info(QName, "Promoting mirror ~s to master~n", + rabbit_mirror_queue_misc:log_info(QName, "Promoting mirror ~s to leader", [rabbit_misc:pid_to_string(self())]), Q1 = amqqueue:set_pid(Q0, self()), DeathFun = rabbit_mirror_queue_master:sender_death_fun(), 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 diff --git a/deps/rabbit/src/rabbit_mnesia_rename.erl b/deps/rabbit/src/rabbit_mnesia_rename.erl index 2a5d0a80d0..351679f616 100644 --- a/deps/rabbit/src/rabbit_mnesia_rename.erl +++ b/deps/rabbit/src/rabbit_mnesia_rename.erl @@ -144,7 +144,7 @@ finish(FromNode, ToNode, AllNodes) -> end; FromNode -> rabbit_log:info( - "Abandoning rename from ~s to ~s since we are still ~s~n", + "Abandoning rename from ~s to ~s since we are still ~s", [FromNode, ToNode, FromNode]), [{ok, _} = file:copy(backup_of_conf(F), F) || F <- config_files()], ok = rabbit_file:recursive_delete([rabbit_mnesia:dir()]), @@ -155,18 +155,18 @@ finish(FromNode, ToNode, AllNodes) -> %% Boot will almost certainly fail but we might as %% well just log this rabbit_log:info( - "Rename attempted from ~s to ~s but we are ~s - ignoring.~n", + "Rename attempted from ~s to ~s but we are ~s - ignoring.", [FromNode, ToNode, node()]) end. finish_primary(FromNode, ToNode) -> - rabbit_log:info("Restarting as primary after rename from ~s to ~s~n", + rabbit_log:info("Restarting as primary after rename from ~s to ~s", [FromNode, ToNode]), delete_rename_files(), ok. finish_secondary(FromNode, ToNode, AllNodes) -> - rabbit_log:info("Restarting as secondary after rename from ~s to ~s~n", + rabbit_log:info("Restarting as secondary after rename from ~s to ~s", [FromNode, ToNode]), rabbit_upgrade:secondary_upgrade(AllNodes), rename_in_running_mnesia(FromNode, ToNode), diff --git a/deps/rabbit/src/rabbit_msg_store.erl b/deps/rabbit/src/rabbit_msg_store.erl index 0353ba87cf..bdc706ad78 100644 --- a/deps/rabbit/src/rabbit_msg_store.erl +++ b/deps/rabbit/src/rabbit_msg_store.erl @@ -717,7 +717,7 @@ init([Type, BaseDir, ClientRefs, StartupFunState]) -> Name = filename:join(filename:basename(BaseDir), atom_to_list(Type)), {ok, IndexModule} = application:get_env(rabbit, msg_store_index_module), - rabbit_log:info("Message store ~tp: using ~p to provide index~n", [Name, IndexModule]), + rabbit_log:info("Message store ~tp: using ~p to provide index", [Name, IndexModule]), AttemptFileSummaryRecovery = case ClientRefs of @@ -794,11 +794,11 @@ init([Type, BaseDir, ClientRefs, StartupFunState]) -> true -> "clean"; false -> "unclean" end, - rabbit_log:debug("Rebuilding message location index after ~s shutdown...~n", + rabbit_log:debug("Rebuilding message location index after ~s shutdown...", [Cleanliness]), {Offset, State1 = #msstate { current_file = CurFile }} = build_index(CleanShutdown, StartupFunState, State), - rabbit_log:debug("Finished rebuilding index~n", []), + rabbit_log:debug("Finished rebuilding index", []), %% read is only needed so that we can seek {ok, CurHdl} = open_file(Dir, filenum_to_name(CurFile), [read | ?WRITE_MODE]), @@ -999,7 +999,7 @@ terminate(_Reason, State = #msstate { index_state = IndexState, {error, FSErr} -> rabbit_log:error("Unable to store file summary" " for vhost message store for directory ~p~n" - "Error: ~p~n", + "Error: ~p", [Dir, FSErr]) end, [true = ets:delete(T) || T <- [FileSummaryEts, FileHandlesEts, @@ -1012,7 +1012,7 @@ terminate(_Reason, State = #msstate { index_state = IndexState, ok; {error, RTErr} -> rabbit_log:error("Unable to save message store recovery terms" - " for directory ~p~nError: ~p~n", + " for directory ~p~nError: ~p", [Dir, RTErr]) end, State3 #msstate { index_state = undefined, @@ -1574,12 +1574,12 @@ index_clean_up_temporary_reference_count_entries( recover_index_and_client_refs(IndexModule, _Recover, undefined, Dir, _Name) -> {false, IndexModule:new(Dir), []}; recover_index_and_client_refs(IndexModule, false, _ClientRefs, Dir, Name) -> - rabbit_log:warning("Message store ~tp: rebuilding indices from scratch~n", [Name]), + rabbit_log:warning("Message store ~tp: rebuilding indices from scratch", [Name]), {false, IndexModule:new(Dir), []}; recover_index_and_client_refs(IndexModule, true, ClientRefs, Dir, Name) -> Fresh = fun (ErrorMsg, ErrorArgs) -> rabbit_log:warning("Message store ~tp : " ++ ErrorMsg ++ "~n" - "rebuilding indices from scratch~n", + "rebuilding indices from scratch", [Name | ErrorArgs]), {false, IndexModule:new(Dir), []} end, @@ -1741,9 +1741,9 @@ build_index(true, _StartupFunState, end, {0, State}, FileSummaryEts); build_index(false, {MsgRefDeltaGen, MsgRefDeltaGenInit}, State = #msstate { dir = Dir }) -> - rabbit_log:debug("Rebuilding message refcount...~n", []), + rabbit_log:debug("Rebuilding message refcount...", []), ok = count_msg_refs(MsgRefDeltaGen, MsgRefDeltaGenInit, State), - rabbit_log:debug("Done rebuilding message refcount~n", []), + rabbit_log:debug("Done rebuilding message refcount", []), {ok, Pid} = gatherer:start_link(), case [filename_to_num(FileName) || FileName <- list_sorted_filenames(Dir, ?FILE_EXTENSION)] of @@ -1757,7 +1757,7 @@ build_index(false, {MsgRefDeltaGen, MsgRefDeltaGenInit}, build_index_worker(Gatherer, State = #msstate { dir = Dir }, Left, File, Files) -> FileName = filenum_to_name(File), - rabbit_log:debug("Rebuilding message location index from ~p (~B file(s) remaining)~n", + rabbit_log:debug("Rebuilding message location index from ~p (~B file(s) remaining)", [form_filename(Dir, FileName), length(Files)]), {ok, Messages, FileSize} = scan_file_for_valid_messages(Dir, FileName), diff --git a/deps/rabbit/src/rabbit_msg_store_ets_index.erl b/deps/rabbit/src/rabbit_msg_store_ets_index.erl index 8c38ae5d55..3c8512babf 100644 --- a/deps/rabbit/src/rabbit_msg_store_ets_index.erl +++ b/deps/rabbit/src/rabbit_msg_store_ets_index.erl @@ -70,7 +70,7 @@ terminate(#state { table = MsgLocations, dir = Dir }) -> ok -> ok; {error, Err} -> rabbit_log:error("Unable to save message store index" - " for directory ~p.~nError: ~p~n", + " for directory ~p.~nError: ~p", [Dir, Err]) end, ets:delete(MsgLocations). diff --git a/deps/rabbit/src/rabbit_networking.erl b/deps/rabbit/src/rabbit_networking.erl index 8b5b684710..6636290134 100644 --- a/deps/rabbit/src/rabbit_networking.erl +++ b/deps/rabbit/src/rabbit_networking.erl @@ -150,7 +150,7 @@ log_poodle_fail(Context) -> "better.~n~n" "If you cannot upgrade now and want to re-enable SSL listeners, you can~n" "set the config item 'ssl_allow_poodle_attack' to 'true' in the~n" - "'rabbit' section of your configuration file.~n", + "'rabbit' section of your configuration file.", [rabbit_misc:otp_release(), Context]). fix_ssl_options(Config) -> @@ -171,7 +171,7 @@ tcp_listener_addresses({Host, Port, Family0}) [{IPAddress, Port, Family} || {IPAddress, Family} <- getaddr(Host, Family0)]; tcp_listener_addresses({_Host, Port, _Family0}) -> - rabbit_log:error("invalid port ~p - not 0..65535~n", [Port]), + rabbit_log:error("invalid port ~p - not 0..65535", [Port]), throw({error, {invalid_port, Port}}). tcp_listener_addresses_auto(Port) -> @@ -371,11 +371,11 @@ on_node_down(Node) -> case lists:member(Node, nodes()) of false -> rabbit_log:info( - "Node ~s is down, deleting its listeners~n", [Node]), + "Node ~s is down, deleting its listeners", [Node]), ok = mnesia:dirty_delete(rabbit_listener, Node); true -> rabbit_log:info( - "Keeping ~s listeners: the node is already back~n", [Node]) + "Keeping ~s listeners: the node is already back", [Node]) end. -spec register_connection(pid()) -> ok. @@ -457,11 +457,11 @@ close_connection(Pid, Explanation) -> case lists:member(Pid, connections()) of true -> Res = rabbit_reader:shutdown(Pid, Explanation), - rabbit_log:info("Closing connection ~p because ~p~n", [Pid, Explanation]), + rabbit_log:info("Closing connection ~p because ~p", [Pid, Explanation]), Res; false -> rabbit_log:warning("Asked to close connection ~p (reason: ~p) " - "but no running cluster node reported it as an active connection. Was it already closed? ~n", + "but no running cluster node reported it as an active connection. Was it already closed? ", [Pid, Explanation]), ok end. @@ -578,7 +578,7 @@ gethostaddr(Host, Family) -> -spec host_lookup_error(_, _) -> no_return(). host_lookup_error(Host, Reason) -> - rabbit_log:error("invalid host ~p - ~p~n", [Host, Reason]), + rabbit_log:error("invalid host ~p - ~p", [Host, Reason]), throw({error, {invalid_host, Host, Reason}}). resolve_family({_,_,_,_}, auto) -> inet; 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]). diff --git a/deps/rabbit/src/rabbit_peer_discovery.erl b/deps/rabbit/src/rabbit_peer_discovery.erl index 888c90e0ff..3a81591942 100644 --- a/deps/rabbit/src/rabbit_peer_discovery.erl +++ b/deps/rabbit/src/rabbit_peer_discovery.erl @@ -84,7 +84,7 @@ lock_acquisition_failure_mode() -> -spec log_configured_backend() -> ok. log_configured_backend() -> - rabbit_log:info("Configured peer discovery backend: ~s~n", [backend()]). + rabbit_log:info("Configured peer discovery backend: ~s", [backend()]). maybe_init() -> Backend = backend(), diff --git a/deps/rabbit/src/rabbit_plugins.erl b/deps/rabbit/src/rabbit_plugins.erl index 5de26cc2fb..e4b8182361 100644 --- a/deps/rabbit/src/rabbit_plugins.erl +++ b/deps/rabbit/src/rabbit_plugins.erl @@ -56,13 +56,13 @@ ensure1(FileJustChanged0) -> {[], []} -> ok; {[], _} -> - rabbit_log:info("Plugins changed; disabled ~p~n", + rabbit_log:info("Plugins changed; disabled ~p", [Stop]); {_, []} -> - rabbit_log:info("Plugins changed; enabled ~p~n", + rabbit_log:info("Plugins changed; enabled ~p", [Start]); {_, _} -> - rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n", + rabbit_log:info("Plugins changed; enabled ~p, disabled ~p", [Start, Stop]) end, {ok, Start, Stop}; @@ -429,7 +429,7 @@ prepare_dir_plugin(PluginAppDescPath) -> rabbit_log:error("Failed to enable plugin \"~s\": " "it may have been built with an " "incompatible (more recent?) " - "version of Erlang~n", [Plugin]), + "version of Erlang", [Plugin]), throw({plugin_built_with_incompatible_erlang, Plugin}); Error -> throw({plugin_module_unloadable, Plugin, Error}) @@ -459,11 +459,11 @@ prepare_plugin(#plugin{type = ez, name = Name, location = Location}, ExpandDir) [PluginAppDescPath|_] -> prepare_dir_plugin(PluginAppDescPath); _ -> - rabbit_log:error("Plugin archive '~s' doesn't contain an .app file~n", [Location]), + rabbit_log:error("Plugin archive '~s' doesn't contain an .app file", [Location]), throw({app_file_missing, Name, Location}) end; {error, Reason} -> - rabbit_log:error("Could not unzip plugin archive '~s': ~p~n", [Location, Reason]), + rabbit_log:error("Could not unzip plugin archive '~s': ~p", [Location, Reason]), throw({failed_to_unzip_plugin, Name, Location, Reason}) end; prepare_plugin(#plugin{type = dir, location = Location, name = Name}, @@ -472,7 +472,7 @@ prepare_plugin(#plugin{type = dir, location = Location, name = Name}, [PluginAppDescPath|_] -> prepare_dir_plugin(PluginAppDescPath); _ -> - rabbit_log:error("Plugin directory '~s' doesn't contain an .app file~n", [Location]), + rabbit_log:error("Plugin directory '~s' doesn't contain an .app file", [Location]), throw({app_file_missing, Name, Location}) end. diff --git a/deps/rabbit/src/rabbit_prequeue.erl b/deps/rabbit/src/rabbit_prequeue.erl index 0dd9c3e451..fd368fc9d2 100644 --- a/deps/rabbit/src/rabbit_prequeue.erl +++ b/deps/rabbit/src/rabbit_prequeue.erl @@ -79,7 +79,7 @@ init(Q0, restart) when ?is_amqqueue(Q0) -> crash_restart(Q0) when ?is_amqqueue(Q0) -> QueueName = amqqueue:get_name(Q0), - rabbit_log:error("Restarting crashed ~s.~n", [rabbit_misc:rs(QueueName)]), + rabbit_log:error("Restarting crashed ~s.", [rabbit_misc:rs(QueueName)]), gen_server2:cast(self(), init), Q1 = amqqueue:set_pid(Q0, self()), rabbit_amqqueue_process:init(Q1). diff --git a/deps/rabbit/src/rabbit_priority_queue.erl b/deps/rabbit/src/rabbit_priority_queue.erl index e66334e291..355fadcfc3 100644 --- a/deps/rabbit/src/rabbit_priority_queue.erl +++ b/deps/rabbit/src/rabbit_priority_queue.erl @@ -67,7 +67,7 @@ enable() -> {ok, RealBQ} = application:get_env(rabbit, backing_queue_module), case RealBQ of ?MODULE -> ok; - _ -> rabbit_log:info("Priority queues enabled, real BQ is ~s~n", + _ -> rabbit_log:info("Priority queues enabled, real BQ is ~s", [RealBQ]), application:set_env( rabbitmq_priority_queue, backing_queue_module, RealBQ), diff --git a/deps/rabbit/src/rabbit_queue_index.erl b/deps/rabbit/src/rabbit_queue_index.erl index e376501f31..eba445e8c3 100644 --- a/deps/rabbit/src/rabbit_queue_index.erl +++ b/deps/rabbit/src/rabbit_queue_index.erl @@ -1478,7 +1478,7 @@ move_to_per_vhost_stores(#resource{virtual_host = VHost} = QueueName) -> ok = rabbit_file:rename(OldQueueDir, NewQueueDir), ok = ensure_queue_name_stub_file(NewQueueDir, QueueName); false -> - Msg = "Queue index directory '~s' not found for ~s~n", + Msg = "Queue index directory '~s' not found for ~s", Args = [OldQueueDir, rabbit_misc:rs(QueueName)], rabbit_log_upgrade:error(Msg, Args), rabbit_log:error(Msg, Args) diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl index af5373012c..aa66c97775 100644 --- a/deps/rabbit/src/rabbit_quorum_queue.erl +++ b/deps/rabbit/src/rabbit_quorum_queue.erl @@ -419,7 +419,7 @@ handle_tick(QName, [] -> ok; Stale -> - rabbit_log:info("~s: stale nodes detected. Purging ~w~n", + rabbit_log:info("~s: stale nodes detected. Purging ~w", [rabbit_misc:rs(QName), Stale]), %% pipeline purge command {ok, Q} = rabbit_amqqueue:lookup(QName), @@ -618,7 +618,7 @@ force_delete_queue(Servers) -> Err -> rabbit_log:warning( "Force delete of ~w failed with: ~w" - "This may require manual data clean up~n", + "This may require manual data clean up", [S, Err]), ok end diff --git a/deps/rabbit/src/rabbit_reader.erl b/deps/rabbit/src/rabbit_reader.erl index 9e209cdd98..08322cb393 100644 --- a/deps/rabbit/src/rabbit_reader.erl +++ b/deps/rabbit/src/rabbit_reader.erl @@ -272,10 +272,10 @@ server_capabilities(_) -> %%-------------------------------------------------------------------------- socket_error(Reason) when is_atom(Reason) -> - rabbit_log_connection:error("Error on AMQP connection ~p: ~s~n", + rabbit_log_connection:error("Error on AMQP connection ~p: ~s", [self(), rabbit_misc:format_inet_error(Reason)]); socket_error(Reason) -> - Fmt = "Error on AMQP connection ~p:~n~p~n", + Fmt = "Error on AMQP connection ~p:~n~p", Args = [self(), Reason], case Reason of %% The socket was closed while upgrading to SSL. @@ -362,11 +362,11 @@ start_connection(Parent, HelperSup, Deb, Sock) -> %% connection was closed cleanly by the client #v1{connection = #connection{user = #user{username = Username}, vhost = VHost}} -> - rabbit_log_connection:info("closing AMQP connection ~p (~s, vhost: '~s', user: '~s')~n", + rabbit_log_connection:info("closing AMQP connection ~p (~s, vhost: '~s', user: '~s')", [self(), dynamic_connection_name(Name), VHost, Username]); %% just to be more defensive _ -> - rabbit_log_connection:info("closing AMQP connection ~p (~s)~n", + rabbit_log_connection:info("closing AMQP connection ~p (~s)", [self(), dynamic_connection_name(Name)]) end catch @@ -416,36 +416,36 @@ log_connection_exception(Severity, Name, {heartbeat_timeout, TimeoutSec}) -> %% Long line to avoid extra spaces and line breaks in log log_connection_exception_with_severity(Severity, "closing AMQP connection ~p (~s):~n" - "missed heartbeats from client, timeout: ~ps~n", + "missed heartbeats from client, timeout: ~ps", [self(), Name, TimeoutSec]); log_connection_exception(Severity, Name, {connection_closed_abruptly, #v1{connection = #connection{user = #user{username = Username}, vhost = VHost}}}) -> log_connection_exception_with_severity(Severity, - "closing AMQP connection ~p (~s, vhost: '~s', user: '~s'):~nclient unexpectedly closed TCP connection~n", + "closing AMQP connection ~p (~s, vhost: '~s', user: '~s'):~nclient unexpectedly closed TCP connection", [self(), Name, VHost, Username]); %% when client abruptly closes connection before connection.open/authentication/authorization %% succeeded, don't log username and vhost as 'none' log_connection_exception(Severity, Name, {connection_closed_abruptly, _}) -> log_connection_exception_with_severity(Severity, - "closing AMQP connection ~p (~s):~nclient unexpectedly closed TCP connection~n", + "closing AMQP connection ~p (~s):~nclient unexpectedly closed TCP connection", [self(), Name]); %% failed connection.tune negotiations log_connection_exception(Severity, Name, {handshake_error, tuning, _Channel, {exit, #amqp_error{explanation = Explanation}, _Method, _Stacktrace}}) -> log_connection_exception_with_severity(Severity, - "closing AMQP connection ~p (~s):~nfailed to negotiate connection parameters: ~s~n", + "closing AMQP connection ~p (~s):~nfailed to negotiate connection parameters: ~s", [self(), Name, Explanation]); %% old exception structure log_connection_exception(Severity, Name, connection_closed_abruptly) -> log_connection_exception_with_severity(Severity, "closing AMQP connection ~p (~s):~n" - "client unexpectedly closed TCP connection~n", + "client unexpectedly closed TCP connection", [self(), Name]); log_connection_exception(Severity, Name, Ex) -> log_connection_exception_with_severity(Severity, - "closing AMQP connection ~p (~s):~n~p~n", + "closing AMQP connection ~p (~s):~n~p", [self(), Name, Ex]). log_connection_exception_with_severity(Severity, Fmt, Args) -> @@ -505,7 +505,7 @@ mainloop(Deb, Buf, BufLen, State = #v1{sock = Sock, %% %% The goal is to not log TCP healthchecks (a connection %% with no data received) unless specified otherwise. - Fmt = "accepting AMQP connection ~p (~s)~n", + Fmt = "accepting AMQP connection ~p (~s)", Args = [self(), ConnName], case Recv of closed -> rabbit_log_connection:debug(Fmt, Args); @@ -753,7 +753,7 @@ wait_for_channel_termination(N, TimerRef, rabbit_log_connection:error( "Error on AMQP connection ~p (~s, vhost: '~s'," " user: '~s', state: ~p), channel ~p:" - "error while terminating:~n~p~n", + "error while terminating:~n~p", [self(), ConnName, VHost, User#user.username, CS, Channel, Reason]), handle_uncontrolled_channel_close(ChPid), @@ -794,7 +794,7 @@ log_hard_error(#v1{connection_state = CS, vhost = VHost}}, Channel, Reason) -> rabbit_log_connection:error( "Error on AMQP connection ~p (~s, vhost: '~s'," - " user: '~s', state: ~p), channel ~p:~n ~s~n", + " user: '~s', state: ~p), channel ~p:~n ~s", [self(), ConnName, VHost, User#user.username, CS, Channel, format_hard_error(Reason)]). handle_exception(State = #v1{connection_state = closed}, Channel, Reason) -> @@ -813,7 +813,7 @@ handle_exception(State = #v1{connection = #connection{protocol = Protocol, Channel, Reason = #amqp_error{name = access_refused, explanation = ErrMsg}) -> rabbit_log_connection:error( - "Error on AMQP connection ~p (~s, state: ~p):~n~s~n", + "Error on AMQP connection ~p (~s, state: ~p):~n~s", [self(), ConnName, starting, ErrMsg]), %% respect authentication failure notification capability case rabbit_misc:table_lookup(Capabilities, @@ -832,7 +832,7 @@ handle_exception(State = #v1{connection = #connection{protocol = Protocol, Channel, Reason = #amqp_error{name = not_allowed, explanation = ErrMsg}) -> rabbit_log_connection:error( - "Error on AMQP connection ~p (~s, user: '~s', state: ~p):~n~s~n", + "Error on AMQP connection ~p (~s, user: '~s', state: ~p):~n~s", [self(), ConnName, User#user.username, opening, ErrMsg]), send_error_on_channel0_and_close(Channel, Protocol, Reason, State); handle_exception(State = #v1{connection = #connection{protocol = Protocol}, @@ -850,7 +850,7 @@ handle_exception(State = #v1{connection = #connection{protocol = Protocol, explanation = ErrMsg}) -> rabbit_log_connection:error( "Error on AMQP connection ~p (~s," - " user: '~s', state: ~p):~n~s~n", + " user: '~s', state: ~p):~n~s", [self(), ConnName, User#user.username, tuning, ErrMsg]), send_error_on_channel0_and_close(Channel, Protocol, Reason, State); handle_exception(State, Channel, Reason) -> @@ -1253,7 +1253,7 @@ handle_method0(#'connection.open'{virtual_host = VHost}, maybe_emit_stats(State1), rabbit_log_connection:info( "connection ~p (~s): " - "user '~s' authenticated and granted access to vhost '~s'~n", + "user '~s' authenticated and granted access to vhost '~s'", [self(), dynamic_connection_name(ConnName), Username, VHost]), State1; handle_method0(#'connection.close'{}, State) when ?IS_RUNNING(State) -> @@ -1279,7 +1279,7 @@ handle_method0(#'connection.update_secret'{new_secret = NewSecret, reason = Reas sock = Sock}) when ?IS_RUNNING(State) -> rabbit_log_connection:debug( "connection ~p (~s) of user '~s': " - "asked to update secret, reason: ~s~n", + "asked to update secret, reason: ~s", [self(), dynamic_connection_name(ConnName), Username, Reason]), case rabbit_access_control:update_state(User, NewSecret) of {ok, User1} -> @@ -1296,15 +1296,15 @@ handle_method0(#'connection.update_secret'{new_secret = NewSecret, reason = Reas ok = send_on_channel0(Sock, #'connection.update_secret_ok'{}, Protocol), rabbit_log_connection:info( "connection ~p (~s): " - "user '~s' updated secret, reason: ~s~n", + "user '~s' updated secret, reason: ~s", [self(), dynamic_connection_name(ConnName), Username, Reason]), State#v1{connection = Conn#connection{user = User1}}; {refused, Message} -> - rabbit_log_connection:error("Secret update was refused for user '~p': ~p", + rabbit_log_connection:error("Secret update was refused for user '~s': ~p", [Username, Message]), rabbit_misc:protocol_error(not_allowed, "New secret was refused by one of the backends", []); {error, Message} -> - rabbit_log_connection:error("Secret update for user '~p' failed: ~p", + rabbit_log_connection:error("Secret update for user '~s' failed: ~p", [Username, Message]), rabbit_misc:protocol_error(not_allowed, "Secret update failed", []) @@ -1769,7 +1769,7 @@ augment_connection_log_name(#connection{name = Name} = Connection) -> Connection; UserSpecifiedName -> LogName = <<Name/binary, " - ", UserSpecifiedName/binary>>, - rabbit_log_connection:info("Connection ~p (~s) has a client-provided name: ~s~n", [self(), Name, UserSpecifiedName]), + rabbit_log_connection:info("Connection ~p (~s) has a client-provided name: ~s", [self(), Name, UserSpecifiedName]), ?store_proc_name(LogName), Connection#connection{log_name = LogName} end. diff --git a/deps/rabbit/src/rabbit_table.erl b/deps/rabbit/src/rabbit_table.erl index 3ef3934f8e..a274eb0da4 100644 --- a/deps/rabbit/src/rabbit_table.erl +++ b/deps/rabbit/src/rabbit_table.erl @@ -101,7 +101,7 @@ wait(TableNames, Retry) -> wait(TableNames, Timeout, Retries) -> %% We might be in ctl here for offline ops, in which case we can't %% get_env() for the rabbit app. - rabbit_log:info("Waiting for Mnesia tables for ~p ms, ~p retries left~n", + rabbit_log:info("Waiting for Mnesia tables for ~p ms, ~p retries left", [Timeout, Retries - 1]), Result = case mnesia:wait_for_tables(TableNames, Timeout) of ok -> @@ -120,7 +120,7 @@ wait(TableNames, Timeout, Retries) -> {1, {error, _} = Error} -> throw(Error); {_, {error, Error}} -> - rabbit_log:warning("Error while waiting for Mnesia tables: ~p~n", [Error]), + rabbit_log:warning("Error while waiting for Mnesia tables: ~p", [Error]), wait(TableNames, Timeout, Retries - 1) end. diff --git a/deps/rabbit/src/rabbit_trace.erl b/deps/rabbit/src/rabbit_trace.erl index b63d2c269d..aacfc72136 100644 --- a/deps/rabbit/src/rabbit_trace.erl +++ b/deps/rabbit/src/rabbit_trace.erl @@ -74,13 +74,13 @@ tap_out({#resource{name = QName, virtual_host = VHost}, -spec start(rabbit_types:vhost()) -> 'ok'. start(VHost) -> - rabbit_log:info("Enabling tracing for vhost '~s'~n", [VHost]), + rabbit_log:info("Enabling tracing for vhost '~s'", [VHost]), update_config(fun (VHosts) -> [VHost | VHosts -- [VHost]] end). -spec stop(rabbit_types:vhost()) -> 'ok'. stop(VHost) -> - rabbit_log:info("Disabling tracing for vhost '~s'~n", [VHost]), + rabbit_log:info("Disabling tracing for vhost '~s'", [VHost]), update_config(fun (VHosts) -> VHosts -- [VHost] end). update_config(Fun) -> diff --git a/deps/rabbit/src/rabbit_tracking.erl b/deps/rabbit/src/rabbit_tracking.erl index fba283097e..88a825b373 100644 --- a/deps/rabbit/src/rabbit_tracking.erl +++ b/deps/rabbit/src/rabbit_tracking.erl @@ -52,7 +52,7 @@ count_tracked_items(TableNameFun, CountRecPosition, Key, ContextMsg) -> Acc + N catch _:Err -> rabbit_log:error( - "Failed to fetch number of ~p ~p on node ~p:~n~p~n", + "Failed to fetch number of ~p ~p on node ~p:~n~p", [ContextMsg, Key, Node, Err]), Acc end diff --git a/deps/rabbit/src/rabbit_upgrade.erl b/deps/rabbit/src/rabbit_upgrade.erl index b0fe7fbbf4..0f360863c8 100644 --- a/deps/rabbit/src/rabbit_upgrade.erl +++ b/deps/rabbit/src/rabbit_upgrade.erl @@ -91,9 +91,9 @@ ensure_backup_taken() -> take_backup() -> BackupDir = backup_dir(), - info("upgrades: Backing up mnesia dir to ~p~n", [BackupDir]), + info("upgrades: Backing up mnesia dir to ~p", [BackupDir]), case rabbit_mnesia:copy_db(BackupDir) of - ok -> info("upgrades: Mnesia dir backed up to ~p~n", + ok -> info("upgrades: Mnesia dir backed up to ~p", [BackupDir]); {error, E} -> throw({could_not_back_up_mnesia_dir, E, BackupDir}) end. @@ -106,7 +106,7 @@ ensure_backup_removed() -> remove_backup() -> ok = rabbit_file:recursive_delete([backup_dir()]), - info("upgrades: Mnesia backup removed~n", []). + info("upgrades: Mnesia backup removed", []). -spec maybe_upgrade_mnesia() -> 'ok'. @@ -216,7 +216,7 @@ primary_upgrade(Upgrades, Nodes) -> rabbit_table:force_load(), case Others of [] -> ok; - _ -> info("mnesia upgrades: Breaking cluster~n", []), + _ -> info("mnesia upgrades: Breaking cluster", []), [{atomic, ok} = mnesia:del_table_copy(schema, Node) || Node <- Others] end @@ -280,16 +280,16 @@ maybe_migrate_queues_to_per_vhost_storage() -> apply_upgrades(Scope, Upgrades, Fun) -> ok = rabbit_file:lock_file(lock_filename()), - info("~s upgrades: ~w to apply~n", [Scope, length(Upgrades)]), + info("~s upgrades: ~w to apply", [Scope, length(Upgrades)]), rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), Fun(), [apply_upgrade(Scope, Upgrade) || Upgrade <- Upgrades], - info("~s upgrades: All upgrades applied successfully~n", [Scope]), + info("~s upgrades: All upgrades applied successfully", [Scope]), ok = rabbit_version:record_desired_for_scope(Scope), ok = file:delete(lock_filename()). apply_upgrade(Scope, {M, F}) -> - info("~s upgrades: Applying ~w:~w~n", [Scope, M, F]), + info("~s upgrades: Applying ~w:~w", [Scope, M, F]), ok = apply(M, F, []). %% ------------------------------------------------------------------- diff --git a/deps/rabbit/src/rabbit_upgrade_functions.erl b/deps/rabbit/src/rabbit_upgrade_functions.erl index 2fd57d72b6..dd856c42f0 100644 --- a/deps/rabbit/src/rabbit_upgrade_functions.erl +++ b/deps/rabbit/src/rabbit_upgrade_functions.erl @@ -426,9 +426,9 @@ cluster_name_tx() -> case Tl of [] -> ok; _ -> {VHost, _, _} = K, - error_logger:warning_msg( + logger:warning( "Multiple local-nodenames found, picking '~s' " - "from '~s' for cluster name~n", [Name, VHost]) + "from '~s' for cluster name", [Name, VHost]) end end, [mnesia:delete(T, K, write) || K <- Ks], diff --git a/deps/rabbit/src/rabbit_variable_queue.erl b/deps/rabbit/src/rabbit_variable_queue.erl index b23592ecf0..d4bd907e78 100644 --- a/deps/rabbit/src/rabbit_variable_queue.erl +++ b/deps/rabbit/src/rabbit_variable_queue.erl @@ -484,7 +484,7 @@ stop(VHost) -> ok = rabbit_queue_index:stop(VHost). start_msg_store(VHost, Refs, StartFunState) when is_list(Refs); Refs == undefined -> - rabbit_log:info("Starting message stores for vhost '~s'~n", [VHost]), + rabbit_log:info("Starting message stores for vhost '~s'", [VHost]), do_start_msg_store(VHost, ?TRANSIENT_MSG_STORE, undefined, ?EMPTY_START_FUN_STATE), do_start_msg_store(VHost, ?PERSISTENT_MSG_STORE, Refs, StartFunState), ok. @@ -492,13 +492,13 @@ start_msg_store(VHost, Refs, StartFunState) when is_list(Refs); Refs == undefine do_start_msg_store(VHost, Type, Refs, StartFunState) -> case rabbit_vhost_msg_store:start(VHost, Type, Refs, StartFunState) of {ok, _} -> - rabbit_log:info("Started message store of type ~s for vhost '~s'~n", [abbreviated_type(Type), VHost]); + rabbit_log:info("Started message store of type ~s for vhost '~s'", [abbreviated_type(Type), VHost]); {error, {no_such_vhost, VHost}} = Err -> - rabbit_log:error("Failed to start message store of type ~s for vhost '~s': the vhost no longer exists!~n", + rabbit_log:error("Failed to start message store of type ~s for vhost '~s': the vhost no longer exists!", [Type, VHost]), exit(Err); {error, Error} -> - rabbit_log:error("Failed to start message store of type ~s for vhost '~s': ~p~n", + rabbit_log:error("Failed to start message store of type ~s for vhost '~s': ~p", [Type, VHost, Error]), exit({error, Error}) end. @@ -2846,7 +2846,7 @@ move_messages_to_vhost_store(Queues) -> in_batches(MigrationBatchSize, {rabbit_variable_queue, migrate_queue, [OldStore, NewMsgStore]}, QueuesWithTerms, - "message_store upgrades: Migrating batch ~p of ~p queues. Out of total ~p ~n", + "message_store upgrades: Migrating batch ~p of ~p queues. Out of total ~p ", "message_store upgrades: Batch ~p of ~p queues migrated ~n. ~p total left"), log_upgrade("Message store migration finished"), @@ -2882,7 +2882,7 @@ migrate_queue({QueueName = #resource{virtual_host = VHost, name = Name}, RecoveryTerm}, OldStore, NewStore) -> log_upgrade_verbose( - "Migrating messages in queue ~s in vhost ~s to per-vhost message store~n", + "Migrating messages in queue ~s in vhost ~s to per-vhost message store", [Name, VHost]), OldStoreClient = get_global_store_client(OldStore), NewStoreClient = get_per_vhost_store_client(QueueName, NewStore), diff --git a/deps/rabbit/src/rabbit_vhost.erl b/deps/rabbit/src/rabbit_vhost.erl index 0e6a6a0204..76aabd0fc8 100644 --- a/deps/rabbit/src/rabbit_vhost.erl +++ b/deps/rabbit/src/rabbit_vhost.erl @@ -43,7 +43,7 @@ recover() -> recover(VHost) -> VHostDir = msg_store_dir_path(VHost), - rabbit_log:info("Making sure data directory '~ts' for vhost '~s' exists~n", + rabbit_log:info("Making sure data directory '~ts' for vhost '~s' exists", [VHostDir, VHost]), VHostStubFile = filename:join(VHostDir, ".vhost"), ok = rabbit_file:ensure_dir(VHostStubFile), @@ -147,7 +147,7 @@ delete(VHost, ActingUser) -> %% process, which in turn results in further mnesia actions and %% eventually the termination of that process. Exchange deletion causes %% notifications which must be sent outside the TX - rabbit_log:info("Deleting vhost '~s'~n", [VHost]), + rabbit_log:info("Deleting vhost '~s'", [VHost]), QDelFun = fun (Q) -> rabbit_amqqueue:delete(Q, false, false, ActingUser) end, [begin Name = amqqueue:get_name(Q), @@ -257,7 +257,7 @@ vhost_down(VHost) -> delete_storage(VHost) -> VhostDir = msg_store_dir_path(VHost), - rabbit_log:info("Deleting message store directory for vhost '~s' at '~s'~n", [VHost, VhostDir]), + rabbit_log:info("Deleting message store directory for vhost '~s' at '~s'", [VHost, VhostDir]), %% Message store should be closed when vhost supervisor is closed. case rabbit_file:recursive_delete([VhostDir]) of ok -> ok; diff --git a/deps/rabbit/src/rabbit_vhost_process.erl b/deps/rabbit/src/rabbit_vhost_process.erl index 7b0ff2a4d9..5c8c56a63a 100644 --- a/deps/rabbit/src/rabbit_vhost_process.erl +++ b/deps/rabbit/src/rabbit_vhost_process.erl @@ -41,7 +41,7 @@ start_link(VHost) -> init([VHost]) -> process_flag(trap_exit, true), - rabbit_log:debug("Recovering data for VHost ~p~n", [VHost]), + rabbit_log:debug("Recovering data for VHost ~p", [VHost]), try %% Recover the vhost data and save it to vhost registry. ok = rabbit_vhost:recover(VHost), diff --git a/deps/rabbit/src/rabbit_vhost_sup_sup.erl b/deps/rabbit/src/rabbit_vhost_sup_sup.erl index 6821f4ae53..b24d3f0fbf 100644 --- a/deps/rabbit/src/rabbit_vhost_sup_sup.erl +++ b/deps/rabbit/src/rabbit_vhost_sup_sup.erl @@ -79,7 +79,7 @@ stop_and_delete_vhost(VHost) -> false -> ok; true -> rabbit_log:info("Stopping vhost supervisor ~p" - " for vhost '~s'~n", + " for vhost '~s'", [VHostSupPid, VHost]), case supervisor2:terminate_child(?MODULE, WrapperPid) of ok -> diff --git a/deps/rabbit/src/tcp_listener.erl b/deps/rabbit/src/tcp_listener.erl index b3ae506f53..712280fce1 100644 --- a/deps/rabbit/src/tcp_listener.erl +++ b/deps/rabbit/src/tcp_listener.erl @@ -65,9 +65,7 @@ start_link(IPAddress, Port, init({IPAddress, Port, {M,F,A} = OnStartup, OnShutdown, Label}) -> process_flag(trap_exit, true), - error_logger:info_msg( - "started ~s on ~s:~p~n", - [Label, rabbit_misc:ntoab(IPAddress), Port]), + logger:info("started ~s on ~s:~p", [Label, rabbit_misc:ntoab(IPAddress), Port]), apply(M, F, A ++ [IPAddress, Port]), {ok, #state{on_startup = OnStartup, on_shutdown = OnShutdown, label = Label, ip=IPAddress, port=Port}}. @@ -82,8 +80,7 @@ handle_info(_Info, State) -> {noreply, State}. terminate(_Reason, #state{on_shutdown = {M,F,A}, label=Label, ip=IPAddress, port=Port}) -> - error_logger:info_msg("stopped ~s on ~s:~p~n", - [Label, rabbit_misc:ntoab(IPAddress), Port]), + logger:info("stopped ~s on ~s:~p", [Label, rabbit_misc:ntoab(IPAddress), Port]), apply(M, F, A ++ [IPAddress, Port]). code_change(_OldVsn, State, _Extra) -> diff --git a/deps/rabbit_common/src/file_handle_cache.erl b/deps/rabbit_common/src/file_handle_cache.erl index 80d6c32de3..50ea181d14 100644 --- a/deps/rabbit_common/src/file_handle_cache.erl +++ b/deps/rabbit_common/src/file_handle_cache.erl @@ -1083,8 +1083,8 @@ init([AlarmSet, AlarmClear]) -> end end, ObtainLimit = obtain_limit(Limit), - error_logger:info_msg("Limiting to approx ~p file handles (~p sockets)~n", - [Limit, ObtainLimit]), + logger:info("Limiting to approx ~p file handles (~p sockets)", + [Limit, ObtainLimit]), Clients = ets:new(?CLIENT_ETS_TABLE, [set, private, {keypos, #cstate.pid}]), Elders = ets:new(?ELDERS_ETS_TABLE, [set, private]), {ok, #fhc_state { elders = Elders, diff --git a/deps/rabbit_common/src/rabbit_amqp_connection.erl b/deps/rabbit_common/src/rabbit_amqp_connection.erl index 72784644a7..058fa7d590 100644 --- a/deps/rabbit_common/src/rabbit_amqp_connection.erl +++ b/deps/rabbit_common/src/rabbit_amqp_connection.erl @@ -14,11 +14,11 @@ amqp_params(ConnPid, Timeout) -> P = try gen_server:call(ConnPid, {info, [amqp_params]}, Timeout) catch exit:{noproc, Error} -> - rabbit_log:debug("file ~p, line ~p - connection process ~p not alive: ~p~n", + rabbit_log:debug("file ~p, line ~p - connection process ~p not alive: ~p", [?FILE, ?LINE, ConnPid, Error]), []; _:Error -> - rabbit_log:debug("file ~p, line ~p - failed to get amqp_params from connection process ~p: ~p~n", + rabbit_log:debug("file ~p, line ~p - failed to get amqp_params from connection process ~p: ~p", [?FILE, ?LINE, ConnPid, Error]), [] end, diff --git a/deps/rabbit_common/src/rabbit_binary_generator.erl b/deps/rabbit_common/src/rabbit_binary_generator.erl index 300f6b6c80..1df98e50c4 100644 --- a/deps/rabbit_common/src/rabbit_binary_generator.erl +++ b/deps/rabbit_common/src/rabbit_binary_generator.erl @@ -223,7 +223,7 @@ lookup_amqp_exception(#amqp_error{name = Name, ExplBin = amqp_exception_explanation(Text, Expl), {ShouldClose, Code, ExplBin, Method}; lookup_amqp_exception(Other, Protocol) -> - rabbit_log:warning("Non-AMQP exit reason '~p'~n", [Other]), + rabbit_log:warning("Non-AMQP exit reason '~p'", [Other]), {ShouldClose, Code, Text} = Protocol:lookup_amqp_exception(internal_error), {ShouldClose, Code, Text, none}. diff --git a/deps/rabbit_common/src/rabbit_ssl_options.erl b/deps/rabbit_common/src/rabbit_ssl_options.erl index 738780ebb2..e5302d4420 100644 --- a/deps/rabbit_common/src/rabbit_ssl_options.erl +++ b/deps/rabbit_common/src/rabbit_ssl_options.erl @@ -43,7 +43,7 @@ make_verify_fun(Module, Function, InitialUserState) -> Module:module_info() catch _:Exception -> - rabbit_log:error("SSL verify_fun: module ~s missing: ~p~n", + rabbit_log:error("TLS verify_fun: module ~s missing: ~p", [Module, Exception]), throw({error, {invalid_verify_fun, missing_module}}) end, @@ -66,7 +66,7 @@ make_verify_fun(Module, Function, InitialUserState) -> Module:Function(Args) end; _ -> - rabbit_log:error("SSL verify_fun: no ~s:~s/3 exported~n", + rabbit_log:error("TLS verify_fun: no ~s:~s/3 exported", [Module, Function]), throw({error, {invalid_verify_fun, function_not_exported}}) end. diff --git a/deps/rabbit_common/src/vm_memory_monitor.erl b/deps/rabbit_common/src/vm_memory_monitor.erl index 22a1070377..6cd3034888 100644 --- a/deps/rabbit_common/src/vm_memory_monitor.erl +++ b/deps/rabbit_common/src/vm_memory_monitor.erl @@ -88,7 +88,7 @@ get_total_memory() -> {error, parse_error} -> rabbit_log:warning( "The override value for the total memmory available is " - "not a valid value: ~p, getting total from the system.~n", + "not a valid value: ~p, getting total from the system.", [Value]), get_total_memory_from_os() end; @@ -249,7 +249,7 @@ get_cached_process_memory_and_limit() -> try gen_server:call(?MODULE, get_cached_process_memory_and_limit, infinity) catch exit:{noproc, Error} -> - rabbit_log:warning("Memory monitor process not yet started: ~p~n", [Error]), + rabbit_log:warning("Memory monitor process not yet started: ~p", [Error]), ProcessMemory = get_process_memory_uncached(), {ProcessMemory, infinity} end. @@ -304,7 +304,7 @@ get_total_memory_from_os() -> get_total_memory(os:type()) catch _:Error:Stacktrace -> rabbit_log:warning( - "Failed to get total system memory: ~n~p~n~p~n", + "Failed to get total system memory: ~n~p~n~p", [Error, Stacktrace]), unknown end. @@ -327,7 +327,7 @@ set_mem_limits(State, MemLimit) -> memory_limit = undefined } -> rabbit_log:warning( "Unknown total memory size for your OS ~p. " - "Assuming memory size is ~p MiB (~p bytes).~n", + "Assuming memory size is ~p MiB (~p bytes).", [os:type(), trunc(?MEMORY_SIZE_FOR_UNKNOWN_OS/?ONE_MiB), ?MEMORY_SIZE_FOR_UNKNOWN_OS]); @@ -344,7 +344,7 @@ set_mem_limits(State, MemLimit) -> "Only ~p MiB (~p bytes) of ~p MiB (~p bytes) memory usable due to " "limited address space.~n" "Crashes due to memory exhaustion are possible - see~n" - "https://www.rabbitmq.com/memory.html#address-space~n", + "https://www.rabbitmq.com/memory.html#address-space", [trunc(Limit/?ONE_MiB), Limit, trunc(TotalMemory/?ONE_MiB), TotalMemory]), Limit; @@ -354,7 +354,7 @@ set_mem_limits(State, MemLimit) -> MemLim = interpret_limit(parse_mem_limit(MemLimit), UsableMemory), rabbit_log:info( "Memory high watermark set to ~p MiB (~p bytes)" - " of ~p MiB (~p bytes) total~n", + " of ~p MiB (~p bytes) total", [trunc(MemLim/?ONE_MiB), MemLim, trunc(TotalMemory/?ONE_MiB), TotalMemory] ), @@ -380,13 +380,13 @@ parse_mem_limit(MemLimit) when is_float(MemLimit), MemLimit =< ?MAX_VM_MEMORY_HI MemLimit; parse_mem_limit(MemLimit) when is_float(MemLimit), MemLimit > ?MAX_VM_MEMORY_HIGH_WATERMARK -> rabbit_log:warning( - "Memory high watermark of ~p is above the allowed maximum, falling back to ~p~n", + "Memory high watermark of ~p is above the allowed maximum, falling back to ~p", [MemLimit, ?MAX_VM_MEMORY_HIGH_WATERMARK] ), ?MAX_VM_MEMORY_HIGH_WATERMARK; parse_mem_limit(MemLimit) -> rabbit_log:warning( - "Memory high watermark of ~p is invalid, defaulting to ~p~n", + "Memory high watermark of ~p is invalid, defaulting to ~p", [MemLimit, ?DEFAULT_VM_MEMORY_HIGH_WATERMARK] ), ?DEFAULT_VM_MEMORY_HIGH_WATERMARK. @@ -408,7 +408,7 @@ internal_update(State0 = #state{memory_limit = MemLimit, emit_update_info(AlarmState, MemUsed, MemLimit) -> rabbit_log:info( - "vm_memory_high_watermark ~p. Memory used:~p allowed:~p~n", + "vm_memory_high_watermark ~p. Memory used:~p allowed:~p", [AlarmState, MemUsed, MemLimit]). %% According to https://msdn.microsoft.com/en-us/library/aa366778(VS.85).aspx diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_incoming_link.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_incoming_link.erl index 32a723195f..a38557e3e1 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_incoming_link.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_incoming_link.erl @@ -132,7 +132,7 @@ transfer(#'v1_0.transfer'{delivery_id = DeliveryId0, send_settle_mode = SSM, recv_settle_mode = RSM} = Link, BCh) -> MsgBin = iolist_to_binary(lists:reverse([MsgPart | MsgAcc])), - ?DEBUG("Inbound content:~n ~p~n", + ?DEBUG("Inbound content:~n ~p", [[amqp10_framing:pprint(Section) || Section <- amqp10_framing:decode_bin(MsgBin)]]), {MsgRKey, Msg} = rabbit_amqp1_0_message:assemble(MsgBin), diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_outgoing_link.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_outgoing_link.erl index 8bb1fd5ac9..3e58a23b76 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_outgoing_link.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_outgoing_link.erl @@ -199,7 +199,7 @@ delivery(Deliver = #'basic.deliver'{delivery_tag = DeliveryTag, batchable = false}, Msg1_0 = rabbit_amqp1_0_message:annotated_message( RKey, Deliver, Msg), - ?DEBUG("Outbound content:~n ~p~n", + ?DEBUG("Outbound content:~n ~p", [[amqp10_framing:pprint(Section) || Section <- amqp10_framing:decode_bin( iolist_to_binary(Msg1_0))]]), diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl index 8906677a9f..a004eacd56 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl @@ -208,7 +208,7 @@ switch_callback(State, Callback, Length) -> terminate(Reason, State) when ?IS_RUNNING(State) -> {normal, handle_exception(State, 0, {?V_1_0_AMQP_ERROR_INTERNAL_ERROR, - "Connection forced: ~p~n", [Reason]})}; + "Connection forced: ~p", [Reason]})}; terminate(_Reason, State) -> {force, State}. @@ -251,7 +251,7 @@ handle_dependent_exit(ChPid, Reason, State) -> {Channel, uncontrolled} -> {RealReason, Trace} = Reason, R = {?V_1_0_AMQP_ERROR_INTERNAL_ERROR, - "Session error: ~p~n~p~n", [RealReason, Trace]}, + "Session error: ~p~n~p", [RealReason, Trace]}, maybe_close(handle_exception(control_throttle(State), Channel, R)) end. @@ -279,13 +279,13 @@ error_frame(Condition, Fmt, Args) -> handle_exception(State = #v1{connection_state = closed}, Channel, #'v1_0.error'{description = {utf8, Desc}}) -> - rabbit_log_connection:error("AMQP 1.0 connection ~p (~p), channel ~p - error:~n~p~n", + rabbit_log_connection:error("Error on AMQP 1.0 connection ~p (~p), channel ~p:~n~p", [self(), closed, Channel, Desc]), State; handle_exception(State = #v1{connection_state = CS}, Channel, ErrorFrame = #'v1_0.error'{description = {utf8, Desc}}) when ?IS_RUNNING(State) orelse CS =:= closing -> - rabbit_log_connection:error("AMQP 1.0 connection ~p (~p), channel ~p - error:~n~p~n", + rabbit_log_connection:error("Error on AMQP 1.0 connection ~p (~p), channel ~p:~n~p", [self(), CS, Channel, Desc]), %% TODO: session errors shouldn't force the connection to close State1 = close_connection(State), @@ -321,11 +321,11 @@ handle_1_0_frame(Mode, Channel, Payload, State) -> %% section 2.8.15 in http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-complete-v1.0-os.pdf handle_exception(State, 0, error_frame( ?V_1_0_AMQP_ERROR_UNAUTHORIZED_ACCESS, - "Access for user '~s' was refused: insufficient permissions~n", [Username])); + "Access for user '~s' was refused: insufficient permissions", [Username])); _:Reason:Trace -> handle_exception(State, 0, error_frame( ?V_1_0_AMQP_ERROR_INTERNAL_ERROR, - "Reader error: ~p~n~p~n", + "Reader error: ~p~n~p", [Reason, Trace])) end. @@ -350,12 +350,12 @@ handle_1_0_frame0(Mode, Channel, Payload, State) -> parse_1_0_frame(Payload, _Channel) -> {PerfDesc, Rest} = amqp10_binary_parser:parse(Payload), Perf = amqp10_framing:decode(PerfDesc), - ?DEBUG("Channel ~p ->~n~p~n~s~n", + ?DEBUG("Channel ~p ->~n~p~n~s", [_Channel, amqp10_framing:pprint(Perf), case Rest of <<>> -> <<>>; _ -> rabbit_misc:format( - " followed by ~p bytes of content~n", [size(Rest)]) + " followed by ~p bytes of content", [size(Rest)]) end]), case Rest of <<>> -> Perf; diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session.erl index ab4fc2c644..6b69f38d98 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session.erl @@ -253,7 +253,7 @@ settle(Disp = #'v1_0.disposition'{first = First0, Map; {value, Entry} -> #outgoing_delivery{delivery_tag = DeliveryTag } = Entry, - ?DEBUG("Settling ~p with ~p~n", [Delivery, _Outcome]), + ?DEBUG("Settling ~p with ~p", [Delivery, _Outcome]), UpstreamAckFun(DeliveryTag), gb_trees:delete(Delivery, Map) end diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session_process.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session_process.erl index e8bc5505e6..d1899ece06 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session_process.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session_process.erl @@ -57,12 +57,12 @@ init({Channel, ReaderPid, WriterPid, #user{username = Username}, VHost, session = rabbit_amqp1_0_session:init(Channel) }}; {error, Reason} -> - rabbit_log:warning("Closing session for connection ~p:~n~p~n", + rabbit_log:warning("Closing session for connection ~p:~n~p", [ReaderPid, Reason]), {stop, Reason} end; {error, Reason} -> - rabbit_log:warning("Closing session for connection ~p:~n~p~n", + rabbit_log:warning("Closing session for connection ~p:~n~p", [ReaderPid, Reason]), {stop, Reason} end. @@ -158,7 +158,7 @@ handle_info({'DOWN', _MRef, process, Ch, Reason}, io_lib:format("~w", [Reason])))}} end, End = #'v1_0.end'{ error = Error }, - rabbit_log:warning("Closing session for connection ~p:~n~p~n", + rabbit_log:warning("Closing session for connection ~p:~n~p", [ReaderPid, Reason]), ok = rabbit_amqp1_0_writer:send_command_sync(Sock, End), {stop, normal, State}; @@ -186,7 +186,7 @@ handle_cast({frame, Frame, FlowPid}, catch exit:Reason = #'v1_0.error'{} -> %% TODO shut down nicely like rabbit_channel End = #'v1_0.end'{ error = Reason }, - rabbit_log:warning("Closing session for connection ~p:~n~p~n", + rabbit_log:warning("Closing session for connection ~p:~n~p", [ReaderPid, Reason]), ok = rabbit_amqp1_0_writer:send_command_sync(Sock, End), {stop, normal, State}; @@ -286,7 +286,7 @@ handle_control(#'v1_0.disposition'{state = Outcome, protocol_error( ?V_1_0_AMQP_ERROR_INVALID_FIELD, "Unrecognised state: ~p~n" - "Disposition was: ~p~n", [Outcome, Disp]) + "Disposition was: ~p", [Outcome, Disp]) end) end, case rabbit_amqp1_0_session:settle(Disp, session(State), AckFun) of diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_writer.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_writer.erl index c70a51112f..f9ab546a0a 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_writer.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_writer.erl @@ -192,13 +192,13 @@ call(Pid, Msg) -> %% Begin 1-0 assemble_frame(Channel, Performative, amqp10_framing) -> - ?DEBUG("Channel ~p <-~n~p~n~n", + ?DEBUG("Channel ~p <-~n~p", [Channel, amqp10_framing:pprint(Performative)]), PerfBin = amqp10_framing:encode_bin(Performative), amqp10_binary_generator:build_frame(Channel, PerfBin); assemble_frame(Channel, Performative, rabbit_amqp1_0_sasl) -> - ?DEBUG("Channel ~p <-~n~p~n~n", + ?DEBUG("Channel ~p <-~n~p", [Channel, amqp10_framing:pprint(Performative)]), PerfBin = amqp10_framing:encode_bin(Performative), amqp10_binary_generator:build_frame(Channel, @@ -211,7 +211,7 @@ assemble_frame(Channel, Performative, rabbit_amqp1_0_sasl) -> assemble_frames(Channel, Performative, Content, _FrameMax, amqp10_framing) -> - ?DEBUG("Channel ~p <-~n~p~n followed by ~p bytes of content~n~n", + ?DEBUG("Channel ~p <-~n~p~n followed by ~p bytes of content", [Channel, amqp10_framing:pprint(Performative), iolist_size(Content)]), PerfBin = amqp10_framing:encode_bin(Performative), diff --git a/deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl b/deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl index 6a73ac5221..f1ea90b475 100644 --- a/deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl +++ b/deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl @@ -483,7 +483,7 @@ with_ldap({ok, Creds}, Fun, Servers) -> network -> Pre = " LDAP network traffic: ", rabbit_log_ldap:info( - " LDAP connecting to servers: ~p~n", [Servers]), + " LDAP connecting to servers: ~p", [Servers]), [{log, fun(1, S, A) -> rabbit_log_ldap:warning(Pre ++ S, A); (2, S, A) -> rabbit_log_ldap:info(Pre ++ S, scrub_creds(A, [])) @@ -491,7 +491,7 @@ with_ldap({ok, Creds}, Fun, Servers) -> network_unsafe -> Pre = " LDAP network traffic: ", rabbit_log_ldap:info( - " LDAP connecting to servers: ~p~n", [Servers]), + " LDAP connecting to servers: ~p", [Servers]), [{log, fun(1, S, A) -> rabbit_log_ldap:warning(Pre ++ S, A); (2, S, A) -> rabbit_log_ldap:info( Pre ++ S, A) end} | Opts0]; @@ -737,7 +737,7 @@ get_expected_env_str(Key, Default) -> V = case env(Key) of Default -> rabbit_log_ldap:warning("rabbitmq_auth_backend_ldap configuration key '~p' is set to " - "the default value of '~p', expected to get a non-default value~n", + "the default value of '~p', expected to get a non-default value", [Key, Default]), Default; V0 -> @@ -833,7 +833,7 @@ dn_lookup(Username, LDAP) -> ?L1("DN lookup: ~s -> ~s", [Username, DN]), DN; {ok, #eldap_search_result{entries = Entries}} -> - rabbit_log_ldap:warning("Searching for DN for ~s, got back ~p~n", + rabbit_log_ldap:warning("Searching for DN for ~s, got back ~p", [Filled, Entries]), Filled; {error, _} = E -> @@ -911,7 +911,7 @@ is_dn(_S) -> false. log(Fmt, Args) -> case env(log) of false -> ok; - _ -> rabbit_log_ldap:info(Fmt ++ "~n", Args) + _ -> rabbit_log_ldap:info(Fmt ++ "", Args) end. fill(Fmt, Args) -> diff --git a/deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl b/deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl index b729a2e106..306c7f2cc8 100644 --- a/deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl +++ b/deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl @@ -41,7 +41,7 @@ description() -> user_login_authentication(Username, AuthProps) -> case authenticate(Username, AuthProps) of {refused, Msg, Args} = AuthResult -> - rabbit_log:debug(Msg ++ "~n", Args), + rabbit_log:debug(Msg, Args), AuthResult; _ = AuthResult -> AuthResult diff --git a/deps/rabbitmq_auth_backend_oauth2/src/wildcard.erl b/deps/rabbitmq_auth_backend_oauth2/src/wildcard.erl index 4200b87ed5..5c25cbf272 100644 --- a/deps/rabbitmq_auth_backend_oauth2/src/wildcard.erl +++ b/deps/rabbitmq_auth_backend_oauth2/src/wildcard.erl @@ -52,7 +52,7 @@ parse_pattern(Pattern) -> Parts = binary:split(Pattern, <<"*">>, [global]), try lists:map(fun(Part) -> cow_qs:urldecode(Part) end, Parts) catch Type:Error -> - rabbit_log:warning("Invalid pattern ~p : ~p~n", + rabbit_log:warning("Invalid pattern ~p : ~p", [Pattern, {Type, Error}]), invalid end. diff --git a/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl b/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl index e3bfecd386..ed9f9d0df4 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl @@ -78,7 +78,7 @@ init({Upstream, XName}) -> gen_server2:cast(self(), maybe_go), {ok, {not_started, {Upstream, UParams, XName}}}; {error, not_found} -> - rabbit_federation_link_util:log_warning(XName, "not found, stopping link~n", []), + rabbit_federation_link_util:log_warning(XName, "not found, stopping link", []), {stop, gone} end. @@ -110,7 +110,7 @@ handle_cast({enqueue, Serial, Cmd}, {noreply, play_back_commands(State#state{waiting_cmds = Waiting1})} catch exit:{{shutdown, {server_initiated_close, 404, Text}}, _} -> rabbit_federation_link_util:log_warning( - XName, "detected upstream changes, restarting link: ~p~n", [Text]), + XName, "detected upstream changes, restarting link: ~p", [Text]), {stop, {shutdown, restart}, State} end; @@ -629,11 +629,11 @@ check_internal_exchange(IntXNameBin, Params, XFU, fun(404, Text) -> rabbit_federation_link_util:log_warning( XName, "detected internal upstream exchange changes," - " restarting link: ~p~n", [Text]), + " restarting link: ~p", [Text]), upstream_not_found; (Code, Text) -> rabbit_federation_link_util:log_warning( - XName, "internal upstream exchange check failed: ~p ~p~n", + XName, "internal upstream exchange check failed: ~p ~p", [Code, Text]), error end). diff --git a/deps/rabbitmq_federation/src/rabbit_federation_link_util.erl b/deps/rabbitmq_federation/src/rabbit_federation_link_util.erl index 5ef1a93f49..74b4ec1d1f 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_link_util.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_link_util.erl @@ -56,7 +56,7 @@ start_conn_ch(Fun, OUpstream, OUParams, try R = Fun(Conn, Ch, DConn, DCh), log_info( - XorQName, "connected to ~s~n", + XorQName, "connected to ~s", [rabbit_federation_upstream:params_to_string( UParams)]), Name = pget(name, amqp_connection:info(DConn, [name])), @@ -290,7 +290,7 @@ log_terminate(shutdown, Upstream, UParams, XorQName) -> %% the link because configuration has changed. So try to shut down %% nicely so that we do not cause unacked messages to be %% redelivered. - log_info(XorQName, "disconnecting from ~s~n", + log_info(XorQName, "disconnecting from ~s", [rabbit_federation_upstream:params_to_string(UParams)]), rabbit_federation_status:remove(Upstream, XorQName); @@ -332,7 +332,7 @@ disposable_channel_call(Conn, Method, ErrFun) -> end catch Exception:Reason -> - rabbit_log_federation:error("Federation link could not create a disposable (one-off) channel due to an error ~p: ~p~n", [Exception, Reason]) + rabbit_log_federation:error("Federation link could not create a disposable (one-off) channel due to an error ~p: ~p", [Exception, Reason]) end. disposable_connection_call(Params, Method, ErrFun) -> @@ -351,14 +351,14 @@ disposable_connection_call(Params, Method, ErrFun) -> end; {error, {auth_failure, Message}} -> rabbit_log_federation:error("Federation link could not open a disposable (one-off) connection " - "due to an authentication failure: ~s~n", [Message]); + "due to an authentication failure: ~s", [Message]); Error -> rabbit_log_federation:error("Federation link could not open a disposable (one-off) connection, " - "reason: ~p~n", [Error]), + "reason: ~p", [Error]), Error end catch Exception:Reason -> rabbit_log_federation:error("Federation link could not create a disposable (one-off) connection " - "due to an error ~p: ~p~n", [Exception, Reason]) + "due to an error ~p: ~p", [Exception, Reason]) end. diff --git a/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl b/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl index 768e83c992..c281540d56 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl @@ -72,7 +72,7 @@ init({Upstream, Queue}) when ?is_amqqueue(Queue) -> upstream = Upstream, upstream_params = UParams}}; {error, not_found} -> - rabbit_federation_link_util:log_warning(QName, "not found, stopping link~n", []), + rabbit_federation_link_util:log_warning(QName, "not found, stopping link", []), {stop, gone} end. diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_db.erl b/deps/rabbitmq_management/src/rabbit_mgmt_db.erl index 05e18ce25c..09ee723516 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_db.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_db.erl @@ -695,7 +695,7 @@ merge_data(_, D1, D2) -> % we assume if we get here both values a maps maps_merge(fun merge_data/3, D1, D2) catch error:Err -> - rabbit_log:debug("merge_data err ~p got: ~p ~p ~n", [Err, D1, D2]), + rabbit_log:debug("merge_data err ~p got: ~p ~p", [Err, D1, D2]), case is_map(D1) of true -> D1; false -> D2 diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl index e6c50a82de..bcba92c6e4 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl @@ -49,7 +49,7 @@ handle_force_fine_statistics() -> rabbit_log:warning( "force_fine_statistics set to ~p; ignored.~n" "Replaced by {rates_mode, none} in the rabbitmq_management " - "application.~n", [X]) + "application.", [X]) end. %%---------------------------------------------------------------------------- @@ -58,7 +58,7 @@ ensure_statistics_enabled() -> ForceStats = rates_mode() =/= none, handle_force_fine_statistics(), {ok, StatsLevel} = application:get_env(rabbit, collect_statistics), - rabbit_log:info("Management plugin: using rates mode '~p'~n", [rates_mode()]), + rabbit_log:info("Management plugin: using rates mode '~p'", [rates_mode()]), case {ForceStats, StatsLevel} of {true, fine} -> ok; diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index 4db0cbb71e..6f3846de61 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -66,7 +66,7 @@ get_used_fd(State0) -> end catch _:Error -> - State2 = log_fd_error("Could not infer the number of file handles used: ~p~n", [Error], State0), + State2 = log_fd_error("Could not infer the number of file handles used: ~p", [Error], State0), {State2, 0} end. @@ -89,7 +89,7 @@ get_used_fd({unix, BSD}, State0) UsedFd = length(lists:filter(F, string:tokens(Output, "\n"))), {State0, UsedFd} catch _:Error:Stacktrace -> - State1 = log_fd_error("Could not parse fstat output:~n~s~n~p~n", + State1 = log_fd_error("Could not parse fstat output:~n~s~n~p", [Output, {Error, Stacktrace}], State0), {State1, 0} end; @@ -100,7 +100,7 @@ get_used_fd({unix, _}, State0) -> Res = os:cmd(Cmd), case string:right(Res, 7) of "failed\n" -> - State1 = log_fd_error("Could not obtain lsof output~n", [], State0), + State1 = log_fd_error("Could not obtain lsof output", [], State0), {State1, 0}; _ -> UsedFd = string:words(Res, $\n) - 1, @@ -170,7 +170,7 @@ get_used_fd({win32, _}, State0) -> "handle.exe /accepteula -s -p " ++ os:getpid() ++ " 2> nul"), case Handle of [] -> - State1 = log_fd_error("Could not find handle.exe, please install from sysinternals~n", [], State0), + State1 = log_fd_error("Could not find handle.exe, please install from sysinternals", [], State0), {State1, 0}; _ -> case find_files_line(string:tokens(Handle, "\r\n")) of @@ -178,7 +178,7 @@ get_used_fd({win32, _}, State0) -> State1 = log_fd_error("handle.exe output did not contain " "a line beginning with ' File ', unable " "to determine used file descriptor " - "count: ~p~n", [Handle], State0), + "count: ~p", [Handle], State0), {State1, 0}; UsedFd -> {State0, UsedFd} diff --git a/deps/rabbitmq_mqtt/src/mqtt_machine.erl b/deps/rabbitmq_mqtt/src/mqtt_machine.erl index 32d5f49403..30fe193c2f 100644 --- a/deps/rabbitmq_mqtt/src/mqtt_machine.erl +++ b/deps/rabbitmq_mqtt/src/mqtt_machine.erl @@ -168,7 +168,7 @@ apply(_Meta, {machine_version, 0, 1}, {machine_state, Ids}) -> {#machine_state{client_ids = Ids, pids = Pids}, ok, []}; apply(_Meta, Unknown, State) -> - error_logger:error_msg("MQTT Raft state machine v1 received unknown command ~p~n", [Unknown]), + logger:error_("MQTT Raft state machine v1 received unknown command ~p", [Unknown]), {State, {error, {unknown_command, Unknown}}, []}. state_enter(leader, State) -> diff --git a/deps/rabbitmq_mqtt/src/mqtt_machine_v0.erl b/deps/rabbitmq_mqtt/src/mqtt_machine_v0.erl index f9a3a7d379..77cea727dc 100644 --- a/deps/rabbitmq_mqtt/src/mqtt_machine_v0.erl +++ b/deps/rabbitmq_mqtt/src/mqtt_machine_v0.erl @@ -110,7 +110,7 @@ apply(Meta, {leave, Node}, #machine_state{client_ids = Ids} = State0) -> {State, ok, Effects ++ snapshot_effects(Meta, State)}; apply(_Meta, Unknown, State) -> - error_logger:error_msg("MQTT Raft state machine received unknown command ~p~n", [Unknown]), + logger:error("MQTT Raft state machine received an unknown command ~p", [Unknown]), {State, {error, {unknown_command, Unknown}}, []}. state_enter(leader, State) -> diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl index 35f299980a..c74830dc3e 100644 --- a/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl +++ b/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl @@ -120,7 +120,7 @@ process_request(?CONNECT, case creds(Username, Password, SSLLoginName) of nocreds -> rabbit_core_metrics:auth_attempt_failed(Ip, <<>>, mqtt), - rabbit_log_connection:error("MQTT login failed: no credentials provided~n"), + rabbit_log_connection:error("MQTT login failed: no credentials provided"), {?CONNACK_CREDENTIALS, PState1}; {invalid_creds, {undefined, Pass}} when is_list(Pass) -> rabbit_core_metrics:auth_attempt_failed(Ip, <<>>, mqtt), @@ -552,7 +552,7 @@ process_login(UserBin, PassBin, ProtoVersion, {ok, {_, _, _, ToPort}} = rabbit_net:socket_ends(Sock, inbound), {VHostPickedUsing, {VHost, UsernameBin}} = get_vhost(UserBin, SslLoginName, ToPort), rabbit_log_connection:info( - "MQTT vhost picked using ~s~n", + "MQTT vhost picked using ~s", [human_readable_vhost_lookup_strategy(VHostPickedUsing)]), RemoteAddress = list_to_binary(inet:ntoa(Addr)), case rabbit_vhost:exists(VHost) of @@ -578,34 +578,34 @@ process_login(UserBin, PassBin, ProtoVersion, mqtt), amqp_connection:close(Connection), rabbit_log_connection:warning( - "MQTT login failed for ~p access_refused " - "(access must be from localhost)~n", + "MQTT login failed for user ~s: " + "this user's access is restricted to localhost", [binary_to_list(UsernameBin)]), ?CONNACK_AUTH end; {error, {auth_failure, Explanation}} -> rabbit_core_metrics:auth_attempt_failed(RemoteAddress, UsernameBin, mqtt), - rabbit_log_connection:error("MQTT login failed for user '~p' auth_failure: ~s~n", + rabbit_log_connection:error("MQTT login failed for user '~s', authentication failed: ~s", [binary_to_list(UserBin), Explanation]), ?CONNACK_CREDENTIALS; {error, access_refused} -> rabbit_core_metrics:auth_attempt_failed(RemoteAddress, UsernameBin, mqtt), - rabbit_log_connection:warning("MQTT login failed for user '~p': access_refused " - "(vhost access not allowed)~n", + rabbit_log_connection:warning("MQTT login failed for user '~s': " + "virtual host access not allowed", [binary_to_list(UserBin)]), ?CONNACK_AUTH; {error, not_allowed} -> rabbit_core_metrics:auth_attempt_failed(RemoteAddress, UsernameBin, mqtt), %% when vhost allowed for TLS connection - rabbit_log_connection:warning("MQTT login failed for ~p access_refused " - "(vhost access not allowed)~n", + rabbit_log_connection:warning("MQTT login failed for user '~s': " + "virtual host access not allowed", [binary_to_list(UserBin)]), ?CONNACK_AUTH end; false -> rabbit_core_metrics:auth_attempt_failed(RemoteAddress, UsernameBin, mqtt), - rabbit_log_connection:error("MQTT login failed for user '~p' auth_failure: vhost ~s does not exist~n", - [binary_to_list(UserBin), VHost]), + rabbit_log_connection:error("MQTT login failed for user '~s': virtual host '~s' does not exist", + [UserBin, VHost]), ?CONNACK_CREDENTIALS end. @@ -819,7 +819,7 @@ send_will(PState = #proc_state{will_msg = WillMsg = #mqtt_msg{retain = Retain, end; Error -> rabbit_log:warning( - "Could not send last will: ~p~n", + "Could not send last will: ~p", [Error]) end, case ChQos1 of @@ -941,7 +941,7 @@ handle_ra_event(register_timeout, PState) -> PState; handle_ra_event(Evt, PState) -> %% log these? - rabbit_log:debug("unhandled ra_event: ~w ~n", [Evt]), + rabbit_log:debug("unhandled ra_event: ~w ", [Evt]), PState. %% NB: check_*: MQTT spec says we should ack normally, ie pretend there @@ -1003,10 +1003,10 @@ check_topic_access(TopicName, Access, R catch _:{amqp_error, access_refused, Msg, _} -> - rabbit_log:error("operation resulted in an error (access_refused): ~p~n", [Msg]), + rabbit_log:error("operation resulted in an error (access_refused): ~p", [Msg]), {error, access_refused}; _:Error -> - rabbit_log:error("~p~n", [Error]), + rabbit_log:error("~p", [Error]), {error, access_refused} end end. diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl index 81dd917f44..7f7b8eb696 100644 --- a/deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl +++ b/deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl @@ -59,7 +59,7 @@ init([KeepaliveSup, Ref]) -> RealSocket = rabbit_net:unwrap_socket(Sock), case rabbit_net:connection_string(Sock, inbound) of {ok, ConnStr} -> - rabbit_log_connection:debug("MQTT accepting TCP connection ~p (~s)~n", [self(), ConnStr]), + rabbit_log_connection:debug("MQTT accepting TCP connection ~p (~s)", [self(), ConnStr]), rabbit_alarm:register( self(), {?MODULE, conserve_resources, []}), ProcessorState = rabbit_mqtt_processor:initial_state(Sock,ssl_login_name(RealSocket)), @@ -102,7 +102,7 @@ handle_call(Msg, From, State) -> handle_cast(duplicate_id, State = #state{ proc_state = PState, conn_name = ConnName }) -> - rabbit_log_connection:warning("MQTT disconnecting client ~p with duplicate id '~s'~n", + rabbit_log_connection:warning("MQTT disconnecting client ~p with duplicate id '~s'", [ConnName, rabbit_mqtt_processor:info(client_id, PState)]), {stop, {shutdown, duplicate_id}, State}; @@ -110,7 +110,7 @@ handle_cast(decommission_node, State = #state{ proc_state = PState, conn_name = ConnName }) -> rabbit_log_connection:warning("MQTT disconnecting client ~p with client ID '~s' as its node is about" - " to be decommissioned~n", + " to be decommissioned", [ConnName, rabbit_mqtt_processor:info(client_id, PState)]), {stop, {shutdown, decommission_node}, State}; @@ -185,7 +185,7 @@ handle_info({start_keepalives, Keepalive}, handle_info(keepalive_timeout, State = #state {conn_name = ConnStr, proc_state = PState}) -> - rabbit_log_connection:error("closing MQTT connection ~p (keepalive timeout)~n", [ConnStr]), + rabbit_log_connection:error("closing MQTT connection ~p (keepalive timeout)", [ConnStr]), send_will_and_terminate(PState, {shutdown, keepalive_timeout}, State); handle_info(emit_stats, State) -> @@ -210,7 +210,7 @@ handle_pre_hibernate(State) -> {hibernate, State}. do_terminate({network_error, {ssl_upgrade_error, closed}, ConnStr}, _State) -> - rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: connection closed~n", + rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: connection closed", [ConnStr]); do_terminate({network_error, @@ -230,20 +230,20 @@ do_terminate({network_error, {tls_alert, Alert}}, ConnStr}, _State) -> log_tls_alert(Alert, ConnStr); do_terminate({network_error, {ssl_upgrade_error, Reason}, ConnStr}, _State) -> - rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: ~p~n", + rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: ~p", [ConnStr, Reason]); do_terminate({network_error, Reason, ConnStr}, _State) -> - rabbit_log_connection:error("MQTT detected network error on ~s: ~p~n", + rabbit_log_connection:error("MQTT detected network error on ~s: ~p", [ConnStr, Reason]); do_terminate({network_error, Reason}, _State) -> - rabbit_log_connection:error("MQTT detected network error: ~p~n", [Reason]); + rabbit_log_connection:error("MQTT detected network error: ~p", [Reason]); do_terminate(normal, #state{proc_state = ProcState, conn_name = ConnName}) -> rabbit_mqtt_processor:close_connection(ProcState), - rabbit_log_connection:info("closing MQTT connection ~p (~s)~n", [self(), ConnName]), + rabbit_log_connection:info("closing MQTT connection ~p (~s)", [self(), ConnName]), ok; do_terminate(_Reason, #state{proc_state = ProcState}) -> @@ -267,17 +267,17 @@ ssl_login_name(Sock) -> %%---------------------------------------------------------------------------- log_tls_alert(handshake_failure, ConnStr) -> - rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: handshake failure~n", + rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: handshake failure", [ConnStr]); log_tls_alert(unknown_ca, ConnStr) -> - rabbit_log_connection:error("MQTT detected TLS certificate verification error on ~s: alert 'unknown CA'~n", + rabbit_log_connection:error("MQTT detected TLS certificate verification error on ~s: alert 'unknown CA'", [ConnStr]); log_tls_alert(Alert, ConnStr) -> - rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: alert ~s~n", + rabbit_log_connection:error("MQTT detected TLS upgrade error on ~s: alert ~s", [ConnStr, Alert]). log_new_connection(#state{conn_name = ConnStr, proc_state = PState}) -> - rabbit_log_connection:info("accepting MQTT connection ~p (~s, client id: ~s)~n", + rabbit_log_connection:info("accepting MQTT connection ~p (~s, client id: ~s)", [self(), ConnStr, rabbit_mqtt_processor:info(client_id, PState)]). process_received_bytes(<<>>, State = #state{proc_state = ProcState, @@ -310,41 +310,41 @@ process_received_bytes(Bytes, connection = ConnPid }); %% PUBLISH and more {error, unauthorized = Reason, ProcState1} -> - rabbit_log_connection:error("MQTT connection ~s is closing due to an authorization failure~n", [ConnStr]), + rabbit_log_connection:error("MQTT connection ~s is closing due to an authorization failure", [ConnStr]), {stop, {shutdown, Reason}, pstate(State, ProcState1)}; %% CONNECT frames only {error, unauthenticated = Reason, ProcState1} -> - rabbit_log_connection:error("MQTT connection ~s is closing due to an authentication failure~n", [ConnStr]), + rabbit_log_connection:error("MQTT connection ~s is closing due to an authentication failure", [ConnStr]), {stop, {shutdown, Reason}, pstate(State, ProcState1)}; %% CONNECT frames only {error, invalid_client_id = Reason, ProcState1} -> - rabbit_log_connection:error("MQTT cannot accept connection ~s: client uses an invalid ID~n", [ConnStr]), + rabbit_log_connection:error("MQTT cannot accept connection ~s: client uses an invalid ID", [ConnStr]), {stop, {shutdown, Reason}, pstate(State, ProcState1)}; %% CONNECT frames only {error, unsupported_protocol_version = Reason, ProcState1} -> - rabbit_log_connection:error("MQTT cannot accept connection ~s: incompatible protocol version~n", [ConnStr]), + rabbit_log_connection:error("MQTT cannot accept connection ~s: incompatible protocol version", [ConnStr]), {stop, {shutdown, Reason}, pstate(State, ProcState1)}; {error, unavailable = Reason, ProcState1} -> - rabbit_log_connection:error("MQTT cannot accept connection ~s due to an internal error or unavailable component~n", + rabbit_log_connection:error("MQTT cannot accept connection ~s due to an internal error or unavailable component", [ConnStr]), {stop, {shutdown, Reason}, pstate(State, ProcState1)}; {error, Reason, ProcState1} -> - rabbit_log_connection:error("MQTT protocol error on connection ~s: ~p~n", + rabbit_log_connection:error("MQTT protocol error on connection ~s: ~p", [ConnStr, Reason]), {stop, {shutdown, Reason}, pstate(State, ProcState1)}; {error, Error} -> - rabbit_log_connection:error("MQTT detected a framing error on connection ~s: ~p~n", + rabbit_log_connection:error("MQTT detected a framing error on connection ~s: ~p", [ConnStr, Error]), {stop, {shutdown, Error}, State}; {stop, ProcState1} -> {stop, normal, pstate(State, ProcState1)} end; {error, {cannot_parse, Error, Stacktrace}} -> - rabbit_log_connection:error("MQTT cannot parse a frame on connection '~s', unparseable payload: ~p, error: {~p, ~p} ~n", + rabbit_log_connection:error("MQTT cannot parse a frame on connection '~s', unparseable payload: ~p, error: {~p, ~p} ", [ConnStr, Bytes, Error, Stacktrace]), {stop, {shutdown, Error}, State}; {error, Error} -> - rabbit_log_connection:error("MQTT detected a framing error on connection ~s: ~p~n", + rabbit_log_connection:error("MQTT detected a framing error on connection ~s: ~p", [ConnStr, Error]), {stop, {shutdown, Error}, State} end. @@ -382,7 +382,7 @@ network_error(closed, State = #state{conn_name = ConnStr, proc_state = PState}) -> MqttConn = PState#proc_state.connection, - Fmt = "MQTT connection ~p will terminate because peer closed TCP connection~n", + Fmt = "MQTT connection ~p will terminate because peer closed TCP connection", Args = [ConnStr], case MqttConn of undefined -> rabbit_log_connection:debug(Fmt, Args); @@ -393,7 +393,7 @@ network_error(closed, network_error(Reason, State = #state{conn_name = ConnStr, proc_state = PState}) -> - rabbit_log_connection:info("MQTT detected network error for ~p: ~p~n", + rabbit_log_connection:info("MQTT detected network error for ~p: ~p", [ConnStr, Reason]), send_will_and_terminate(PState, State). diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_retainer_sup.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_retainer_sup.erl index afbd260ea1..4d07b784dc 100644 --- a/deps/rabbitmq_mqtt/src/rabbit_mqtt_retainer_sup.erl +++ b/deps/rabbitmq_mqtt/src/rabbit_mqtt_retainer_sup.erl @@ -42,7 +42,7 @@ delete_child(VHost) -> init([]) -> Mod = rabbit_mqtt_retainer:store_module(), - rabbit_log:info("MQTT retained message store: ~p~n", + rabbit_log:info("MQTT retained message store: ~p", [Mod]), {ok, {{one_for_one, 5, 5}, child_specs(Mod, rabbit_vhost:list_names())}}. diff --git a/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl b/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl index ddcc3e0d04..ebdcbbebe2 100644 --- a/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl +++ b/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl @@ -247,7 +247,7 @@ get_next_token(Value) -> api_get_request(Service, Path) -> case rabbitmq_aws:get(Service, Path) of {ok, {_Headers, Payload}} -> - rabbit_log:debug("AWS request: ~s~nResponse: ~p~n", + rabbit_log:debug("AWS request: ~s~nResponse: ~p", [Path, Payload]), {ok, Payload}; {error, {credentials, _}} -> {error, credentials}; diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl index b2641e3b6a..fa48db1389 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_httpc.erl @@ -368,7 +368,7 @@ decode_body(?CONTENT_JSON, Body) -> {error, Err} -> ?LOG_ERROR( "HTTP client could not decode a JSON payload " - "(JSON parser returned an error): ~p.~n", + "(JSON parser returned an error): ~p.", [Err], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), [] diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl index 82a85e3fd7..bea5e59f8c 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl @@ -93,7 +93,7 @@ as_atom(Value) when is_list(Value) -> list_to_atom(Value); as_atom(Value) -> ?LOG_ERROR( - "Unexpected data type for atom value: ~p~n", + "Unexpected data type for atom value: ~p", [Value], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), Value. @@ -114,7 +114,7 @@ as_integer(Value) when is_integer(Value) -> Value; as_integer(Value) -> ?LOG_ERROR( - "Unexpected data type for integer value: ~p~n", + "Unexpected data type for integer value: ~p", [Value], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), Value. @@ -138,7 +138,7 @@ as_string(Value) when is_list(Value) -> lists:flatten(Value); as_string(Value) -> ?LOG_ERROR( - "Unexpected data type for list value: ~p~n", + "Unexpected data type for list value: ~p", [Value], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), Value. @@ -319,14 +319,14 @@ as_proplist(List) when is_list(List) -> || {K, V} <- maps:to_list(Map)]; {error, Error} -> ?LOG_ERROR( - "Unexpected data type for proplist value: ~p. JSON parser returned an error: ~p!~n", + "Unexpected data type for proplist value: ~p. JSON parser returned an error: ~p!", [Value, Error], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), [] end; as_proplist(Value) -> ?LOG_ERROR( - "Unexpected data type for proplist value: ~p.~n", + "Unexpected data type for proplist value: ~p.", [Value], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), []. @@ -350,7 +350,7 @@ as_map(List) when is_list(List) -> Map; {error, Error} -> ?LOG_ERROR( - "Unexpected data type for map value: ~p. JSON parser returned an error: ~p!~n", + "Unexpected data type for map value: ~p. JSON parser returned an error: ~p!", [Value, Error], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), [] @@ -359,7 +359,7 @@ as_map(Map) when is_map(Map) -> Map; as_map(Value) -> ?LOG_ERROR( - "Unexpected data type for map value: ~p.~n", + "Unexpected data type for map value: ~p.", [Value], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), []. @@ -422,7 +422,7 @@ as_list(Value) when is_list(Value) -> end; as_list(Value) -> ?LOG_ERROR( - "Unexpected data type for list value: ~p~n", + "Unexpected data type for list value: ~p", [Value], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), Value. diff --git a/deps/rabbitmq_sharding/src/rabbit_sharding_shard.erl b/deps/rabbitmq_sharding/src/rabbit_sharding_shard.erl index 97d1b03bdb..16a4d1ccd7 100644 --- a/deps/rabbitmq_sharding/src/rabbit_sharding_shard.erl +++ b/deps/rabbitmq_sharding/src/rabbit_sharding_shard.erl @@ -91,7 +91,7 @@ declare_queue(XName, Durable, N, Node) -> catch _Error:Reason -> rabbit_log:error("sharding failed to declare queue for exchange ~p" - " - soft error:~n~p~n", + " - soft error:~n~p", [exchange_bin(XName), Reason]), error end. diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl index c077d2ab41..29091c553d 100644 --- a/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl +++ b/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl @@ -338,11 +338,11 @@ do_make_conn_and_chan(URIs, ShovelName) -> log_connection_failure(Reason, URI, {VHost, Name} = _ShovelName) -> rabbit_log:error( - "Shovel '~s' in vhost '~s' failed to connect (URI: ~s): ~s~n", + "Shovel '~s' in vhost '~s' failed to connect (URI: ~s): ~s", [Name, VHost, amqp_uri:remove_credentials(URI), human_readable_connection_error(Reason)]); log_connection_failure(Reason, URI, ShovelName) -> rabbit_log:error( - "Shovel '~s' failed to connect (URI: ~s): ~s~n", + "Shovel '~s' failed to connect (URI: ~s): ~s", [ShovelName, amqp_uri:remove_credentials(URI), human_readable_connection_error(Reason)]). human_readable_connection_error({auth_failure, Msg}) -> diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl index 5f1f24478a..44e0ee4fe2 100644 --- a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl +++ b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl @@ -36,7 +36,7 @@ -import(rabbit_misc, [pget/2, pget/3]). -import(rabbit_data_coercion, [to_binary/1]). --define(INFO(Text, Args), error_logger:info_msg(Text, Args)). +-define(INFO(Text, Args), rabbit_log_shovel:info(Text, Args)). -define(LINK_CREDIT_TIMEOUT, 5000). -type state() :: rabbit_shovel_behaviour:state(). @@ -182,7 +182,7 @@ handle_source({amqp10_event, {connection, Conn, opened}}, handle_source({amqp10_event, {connection, Conn, {closed, Why}}}, #{source := #{current := #{conn := Conn}}, name := Name}) -> - ?INFO("Shovel ~s source connection closed. Reason: ~p~n", [Name, Why]), + ?INFO("Shovel ~s source connection closed. Reason: ~p", [Name, Why]), {stop, {inbound_conn_closed, Why}}; handle_source({amqp10_event, {session, Sess, begun}}, State = #{source := #{current := #{session := Sess}}}) -> @@ -215,9 +215,8 @@ handle_dest({amqp10_disposition, {Result, Tag}}, {#{Tag := IncomingTag}, rejected} -> {1, rabbit_shovel_behaviour:nack(IncomingTag, false, State1)}; _ -> % not found - this should ideally not happen - error_logger:warning_msg("Shovel ~s amqp10 destination " - "disposition tag not found: ~p~n", - [Name, Tag]), + rabbit_log_shovel:warning("Shovel ~s amqp10 destination disposition tag not found: ~p", + [Name, Tag]), {0, State1} end, rabbit_shovel_behaviour:decr_remaining(Decr, State); @@ -227,7 +226,7 @@ handle_dest({amqp10_event, {connection, Conn, opened}}, handle_dest({amqp10_event, {connection, Conn, {closed, Why}}}, #{name := Name, dest := #{current := #{conn := Conn}}}) -> - ?INFO("Shovel ~s destination connection closed. Reason: ~p~n", [Name, Why]), + ?INFO("Shovel ~s destination connection closed. Reason: ~p", [Name, Why]), {stop, {outbound_conn_died, Why}}; handle_dest({amqp10_event, {session, Sess, begun}}, State = #{dest := #{current := #{session := Sess}}}) -> diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_behaviour.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_behaviour.erl index a9be15914f..9ff6d4082c 100644 --- a/deps/rabbitmq_shovel/src/rabbit_shovel_behaviour.erl +++ b/deps/rabbitmq_shovel/src/rabbit_shovel_behaviour.erl @@ -166,7 +166,7 @@ decr_remaining(N, State = #{source := #{remaining := M} = Src, case M > N of true -> State#{source => Src#{remaining => M - N}}; false -> - rabbit_log_shovel:info("shutting down Shovel '~s', no messages left to transfer~n", [Name]), - rabbit_log_shovel:debug("shutting down Shovel '~s', no messages left to transfer. Shovel state: ~p~n", [Name, State]), + rabbit_log_shovel:info("shutting down Shovel '~s', no messages left to transfer", [Name]), + rabbit_log_shovel:debug("shutting down Shovel '~s', no messages left to transfer. Shovel state: ~p", [Name, State]), exit({shutdown, autodelete}) end. diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp.erl b/deps/rabbitmq_stomp/src/rabbit_stomp.erl index 00d2b86137..d932cc5504 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp.erl @@ -97,7 +97,7 @@ parse_default_user([{passcode, Passcode} | Rest], Configuration) -> default_passcode = Passcode}); parse_default_user([Unknown | Rest], Configuration) -> rabbit_log:warning("rabbit_stomp: ignoring invalid default_user " - "configuration option: ~p~n", [Unknown]), + "configuration option: ~p", [Unknown]), parse_default_user(Rest, Configuration). report_configuration(#stomp_configuration{ @@ -107,16 +107,16 @@ report_configuration(#stomp_configuration{ case Login of undefined -> ok; _ -> rabbit_log:info("rabbit_stomp: default user '~s' " - "enabled~n", [Login]) + "enabled", [Login]) end, case ImplicitConnect of - true -> rabbit_log:info("rabbit_stomp: implicit connect enabled~n"); + true -> rabbit_log:info("rabbit_stomp: implicit connect enabled"); false -> ok end, case SSLCertLogin of - true -> rabbit_log:info("rabbit_stomp: ssl_cert_login enabled~n"); + true -> rabbit_log:info("rabbit_stomp: ssl_cert_login enabled"); false -> ok end, diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl b/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl index e4ec7903cd..0f45b348f2 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl @@ -620,25 +620,24 @@ do_login(Username, Passwd, VirtualHost, Heartbeat, AdapterInfo, Version, connection = Connection, version = Version}); {error, {auth_failure, _}} -> - rabbit_log:warning("STOMP login failed for user ~p~n", - [binary_to_list(Username)]), + rabbit_log:warning("STOMP login failed for user '~s': authentication failed", [Username]), error("Bad CONNECT", "Access refused for user '" ++ binary_to_list(Username) ++ "'~n", [], State); {error, not_allowed} -> - rabbit_log:warning("STOMP login failed - not_allowed " - "(vhost access not allowed)~n"), + rabbit_log:warning("STOMP login failed for user '~s': " + "virtual host access not allowed", [Username]), error("Bad CONNECT", "Virtual host '" ++ binary_to_list(VirtualHost) ++ "' access denied", State); {error, access_refused} -> - rabbit_log:warning("STOMP login failed - access_refused " - "(vhost access not allowed)~n"), + rabbit_log:warning("STOMP login failed for user '~s': " + "virtual host access not allowed", [Username]), error("Bad CONNECT", "Virtual host '" ++ binary_to_list(VirtualHost) ++ "' access denied", State); {error, not_loopback} -> - rabbit_log:warning("STOMP login failed - access_refused " - "(user must access over loopback)~n"), + rabbit_log:warning("STOMP login failed for user '~s': " + "this user's access is restricted to localhost", [Username]), error("Bad CONNECT", "non-loopback access denied", State) end. @@ -1135,12 +1134,12 @@ ok(Command, Headers, BodyFragments, State) -> body_iolist = BodyFragments}, State}. amqp_death(access_refused = ErrorName, Explanation, State) -> - ErrorDesc = rabbit_misc:format("~s~n", [Explanation]), + ErrorDesc = rabbit_misc:format("~s", [Explanation]), log_error(ErrorName, ErrorDesc, none), {stop, normal, close_connection(send_error(atom_to_list(ErrorName), ErrorDesc, State))}; amqp_death(ReplyCode, Explanation, State) -> ErrorName = amqp_connection:error_atom(ReplyCode), - ErrorDesc = rabbit_misc:format("~s~n", [Explanation]), + ErrorDesc = rabbit_misc:format("~s", [Explanation]), log_error(ErrorName, ErrorDesc, none), {stop, normal, close_connection(send_error(atom_to_list(ErrorName), ErrorDesc, State))}. @@ -1162,7 +1161,7 @@ log_error(Message, Detail, ServerPrivateDetail) -> rabbit_log:error("STOMP error frame sent:~n" "Message: ~p~n" "Detail: ~p~n" - "Server private detail: ~p~n", + "Server private detail: ~p", [Message, Detail, ServerPrivateDetail]). %%---------------------------------------------------------------------------- diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp_reader.erl b/deps/rabbitmq_stomp/src/rabbit_stomp_reader.erl index a0aae20ae5..f84b72df1a 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp_reader.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp_reader.erl @@ -70,7 +70,7 @@ init([SupHelperPid, Ref, Configuration]) -> ProcState = rabbit_stomp_processor:initial_state(Configuration, ProcInitArgs), - rabbit_log_connection:info("accepting STOMP connection ~p (~s)~n", + rabbit_log_connection:info("accepting STOMP connection ~p (~s)", [self(), ConnStr]), ParseState = rabbit_stomp_frame:initial_state(), @@ -298,7 +298,7 @@ code_change(_OldVsn, State, _Extra) -> log_reason({network_error, {ssl_upgrade_error, closed}, ConnStr}, _State) -> - rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: connection closed~n", + rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: connection closed", [ConnStr]); @@ -319,46 +319,46 @@ log_reason({network_error, {tls_alert, Alert}}, ConnStr}, _State) -> log_tls_alert(Alert, ConnStr); log_reason({network_error, {ssl_upgrade_error, Reason}, ConnStr}, _State) -> - rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: ~p~n", + rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: ~p", [ConnStr, Reason]); log_reason({network_error, Reason, ConnStr}, _State) -> - rabbit_log_connection:error("STOMP detected network error on ~s: ~p~n", + rabbit_log_connection:error("STOMP detected network error on ~s: ~p", [ConnStr, Reason]); log_reason({network_error, Reason}, _State) -> - rabbit_log_connection:error("STOMP detected network error: ~p~n", [Reason]); + rabbit_log_connection:error("STOMP detected network error: ~p", [Reason]); log_reason({shutdown, client_heartbeat_timeout}, #reader_state{ processor_state = ProcState }) -> AdapterName = rabbit_stomp_processor:adapter_name(ProcState), rabbit_log_connection:warning("STOMP detected missed client heartbeat(s) " - "on connection ~s, closing it~n", [AdapterName]); + "on connection ~s, closing it", [AdapterName]); log_reason({shutdown, {server_initiated_close, Reason}}, #reader_state{conn_name = ConnName}) -> - rabbit_log_connection:info("closing STOMP connection ~p (~s), reason: ~s~n", + rabbit_log_connection:info("closing STOMP connection ~p (~s), reason: ~s", [self(), ConnName, Reason]); log_reason(normal, #reader_state{conn_name = ConnName}) -> - rabbit_log_connection:info("closing STOMP connection ~p (~s)~n", [self(), ConnName]); + rabbit_log_connection:info("closing STOMP connection ~p (~s)", [self(), ConnName]); log_reason(shutdown, undefined) -> - rabbit_log_connection:error("closing STOMP connection that never completed connection handshake (negotiation)~n", []); + rabbit_log_connection:error("closing STOMP connection that never completed connection handshake (negotiation)"); log_reason(Reason, #reader_state{processor_state = ProcState}) -> AdapterName = rabbit_stomp_processor:adapter_name(ProcState), rabbit_log_connection:warning("STOMP connection ~s terminated" - " with reason ~p, closing it~n", [AdapterName, Reason]). + " with reason ~p, closing it", [AdapterName, Reason]). log_tls_alert(handshake_failure, ConnStr) -> - rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: handshake failure~n", + rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: handshake failure", [ConnStr]); log_tls_alert(unknown_ca, ConnStr) -> - rabbit_log_connection:error("STOMP detected TLS certificate verification error on ~s: alert 'unknown CA'~n", + rabbit_log_connection:error("STOMP detected TLS certificate verification error on ~s: alert 'unknown CA'", [ConnStr]); log_tls_alert(Alert, ConnStr) -> - rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: alert ~s~n", + rabbit_log_connection:error("STOMP detected TLS upgrade error on ~s: alert ~s", [ConnStr, Alert]). diff --git a/deps/rabbitmq_stomp/test/python_SUITE_data/src/destinations.py b/deps/rabbitmq_stomp/test/python_SUITE_data/src/destinations.py index 76e5402686..7867b747d7 100644 --- a/deps/rabbitmq_stomp/test/python_SUITE_data/src/destinations.py +++ b/deps/rabbitmq_stomp/test/python_SUITE_data/src/destinations.py @@ -37,9 +37,7 @@ class TestExchange(base.BaseTest): self.assertListener("Expecting an error", numErrs=1) err = self.listener.errors[0] self.assertEquals("not_found", err['headers']['message']) - self.assertEquals( - "NOT_FOUND - no exchange 'does.not.exist' in vhost '/'\n", - err['message']) + self.assertRegex(err['message'], r'^NOT_FOUND') time.sleep(1) self.assertFalse(self.conn.is_connected()) diff --git a/deps/rabbitmq_stream/src/rabbit_stream_manager.erl b/deps/rabbitmq_stream/src/rabbit_stream_manager.erl index ced9f35b8b..1f2b5a5c97 100644 --- a/deps/rabbitmq_stream/src/rabbit_stream_manager.erl +++ b/deps/rabbitmq_stream/src/rabbit_stream_manager.erl @@ -185,19 +185,19 @@ handle_call({create, VirtualHost, Reference, Arguments, Username}, {reply, {error, reference_already_exists}, State}; {error, Err} -> - rabbit_log:warning("Error while creating ~p stream, ~p~n", + rabbit_log:warning("Error while creating ~p stream, ~p", [Reference, Err]), {reply, {error, internal_error}, State} end catch exit:Error -> - rabbit_log:info("Error while creating ~p stream, ~p~n", - [Reference, Error]), + rabbit_log:error("Error while creating ~p stream, ~p", + [Reference, Error]), {reply, {error, internal_error}, State} end; {error, {absent, _, Reason}} -> - rabbit_log:warning("Error while creating ~p stream, ~p~n", - [Reference, Reason]), + rabbit_log:error("Error while creating ~p stream, ~p", + [Reference, Reason]), {reply, {error, internal_error}, State} end; error -> @@ -209,27 +209,25 @@ handle_call({delete, VirtualHost, Reference, Username}, _From, #resource{virtual_host = VirtualHost, kind = queue, name = Reference}, - rabbit_log:debug("Trying to delete stream ~p~n", [Reference]), + rabbit_log:debug("Trying to delete stream ~p", [Reference]), case rabbit_amqqueue:lookup(Name) of {ok, Q} -> - rabbit_log:debug("Found queue record ~p, checking if it is a stream~n", + rabbit_log:debug("Found queue record ~p, checking if it is a stream", [Reference]), case is_stream_queue(Q) of true -> - rabbit_log:debug("Queue record ~p is a stream, trying to delete " - "it~n", + rabbit_log:debug("Queue record ~p is a stream, trying to delete it", [Reference]), - {ok, _} = - rabbit_stream_queue:delete(Q, false, false, Username), - rabbit_log:debug("Stream ~p deleted~n", [Reference]), + {ok, _} = rabbit_stream_queue:delete(Q, false, false, Username), + rabbit_log:debug("Stream ~p deleted", [Reference]), {reply, {ok, deleted}, State}; _ -> - rabbit_log:debug("Queue record ~p is NOT a stream, returning error~n", + rabbit_log:debug("Queue record ~p is NOT a stream, returning error", [Reference]), {reply, {error, reference_not_found}, State} end; {error, not_found} -> - rabbit_log:debug("Stream ~p not found, cannot delete it~n", + rabbit_log:debug("Stream ~p not found, cannot delete it", [Reference]), {reply, {error, reference_not_found}, State} end; @@ -361,8 +359,8 @@ handle_call({route, RoutingKey, VirtualHost, SuperStream}, _From, end catch exit:Error -> - rabbit_log:info("Error while looking up exchange ~p, ~p~n", - [ExchangeName, Error]), + rabbit_log:error("Error while looking up exchange ~p, ~p", + [ExchangeName, Error]), {error, stream_not_found} end, {reply, Res, State}; @@ -384,8 +382,8 @@ handle_call({partitions, VirtualHost, SuperStream}, _From, State) -> [], rabbit_binding:list_for_source(ExchangeName))} catch exit:Error -> - rabbit_log:info("Error while looking up exchange ~p, ~p~n", - [ExchangeName, Error]), + rabbit_log:error("Error while looking up exchange ~p, ~p", + [ExchangeName, Error]), {error, stream_not_found} end, {reply, Res, State}; @@ -396,7 +394,7 @@ handle_cast(_, State) -> {noreply, State}. handle_info(Info, State) -> - rabbit_log:info("Received info ~p~n", [Info]), + rabbit_log:info("Received info ~p", [Info]), {noreply, State}. is_stream_queue(Q) -> diff --git a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl index 595574443b..0303a7272f 100644 --- a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl +++ b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl @@ -210,7 +210,7 @@ init([KeepaliveSup, heartbeat = Heartbeat}); {Error, Reason} -> rabbit_net:fast_close(RealSocket), - rabbit_log:warning("Closing connection because of ~p ~p~n", + rabbit_log:warning("Closing connection because of ~p ~p", [Error, Reason]) end. @@ -220,7 +220,7 @@ socket_op(Sock, Fun) -> {ok, Res} -> Res; {error, Reason} -> - rabbit_log:warning("Error during socket operation ~p~n", [Reason]), + rabbit_log:warning("Error during socket operation ~p", [Reason]), rabbit_net:fast_close(RealSocket), exit(normal) end. @@ -289,7 +289,7 @@ listen_loop_pre_auth(Transport, Data), Transport:setopts(S, [{active, once}]), #stream_connection{connection_step = ConnectionStep} = Connection1, - rabbit_log:info("Transitioned from ~p to ~p~n", + rabbit_log:info("Transitioned from ~p to ~p", [ConnectionStep0, ConnectionStep]), case ConnectionStep of authenticated -> @@ -336,12 +336,12 @@ listen_loop_pre_auth(Transport, Configuration) end; {Closed, S} -> - rabbit_log:info("Socket ~w closed [~w]~n", [S, self()]), + rabbit_log:info("Socket ~w closed [~w]", [S, self()]), ok; {Error, S, Reason} -> - rabbit_log:info("Socket error ~p [~w]~n", [Reason, S, self()]); + rabbit_log:info("Socket error ~p [~w]", [Reason, S, self()]); M -> - rabbit_log:warning("Unknown message ~p~n", [M]), + rabbit_log:warning("Unknown message ~p", [M]), close(Transport, S) end. @@ -585,7 +585,7 @@ listen_loop_post_auth(Transport, {queue_event, #resource{name = StreamName}, {osiris_offset, _QueueResource, -1}}} -> rabbit_log:info("received osiris offset event for ~p with offset " - "~p~n", + "~p", [StreamName, -1]), listen_loop_post_auth(Transport, Connection, State, Configuration); {'$gen_cast', @@ -650,7 +650,7 @@ listen_loop_post_auth(Transport, State, Configuration); Unexpected -> - rabbit_log:info("Heartbeat send error ~p, closing connection~n", + rabbit_log:info("Heartbeat send error ~p, closing connection", [Unexpected]), C1 = demonitor_all_streams(Connection), close(Transport, C1) @@ -691,7 +691,7 @@ listen_loop_post_auth(Transport, {'$gen_call', From, {shutdown, Explanation}} -> % likely closing call from the management plugin gen_server:reply(From, ok), - rabbit_log:info("Forcing stream connection ~p closing: ~p~n", + rabbit_log:info("Forcing stream connection ~p closing: ~p", [self(), Explanation]), demonitor_all_streams(Connection), rabbit_networking:unregister_non_amqp_connection(self()), @@ -702,15 +702,15 @@ listen_loop_post_auth(Transport, demonitor_all_streams(Connection), rabbit_networking:unregister_non_amqp_connection(self()), notify_connection_closed(Connection, State), - rabbit_log:info("Socket ~w closed [~w]~n", [S, self()]), + rabbit_log:warning("Socket ~w closed [~w]", [S, self()]), ok; {Error, S, Reason} -> demonitor_all_streams(Connection), rabbit_networking:unregister_non_amqp_connection(self()), notify_connection_closed(Connection, State), - rabbit_log:info("Socket error ~p [~w]~n", [Reason, S, self()]); + rabbit_log:error("Socket error ~p [~w]", [Reason, S, self()]); M -> - rabbit_log:warning("Unknown message ~p~n", [M]), + rabbit_log:warning("Unknown message ~p", [M]), %% FIXME send close listen_loop_post_auth(Transport, Connection, State, Configuration) end. @@ -747,15 +747,15 @@ listen_loop_post_close(Transport, {Closed, S} -> rabbit_networking:unregister_non_amqp_connection(self()), notify_connection_closed(Connection, State), - rabbit_log:info("Socket ~w closed [~w]~n", [S, self()]), + rabbit_log:info("Socket ~w closed [~w]", [S, self()]), ok; {Error, S, Reason} -> - rabbit_log:info("Socket error ~p [~w]~n", [Reason, S, self()]), + rabbit_log:info("Socket error ~p [~w]", [Reason, S, self()]), close(Transport, S), rabbit_networking:unregister_non_amqp_connection(self()), notify_connection_closed(Connection, State); M -> - rabbit_log:warning("Ignored message on closing ~p~n", [M]) + rabbit_log:warning("Ignored message on closing ~p", [M]) end. handle_inbound_data_pre_auth(Transport, Connection, State, Rest) -> @@ -1037,7 +1037,7 @@ handle_frame_pre_auth(Transport, rabbit_core_metrics:auth_attempt_failed(RemoteAddress, Username, stream), - rabbit_log:warning("User '~s' can only connect via localhost~n", + rabbit_log:warning("User '~s' can only connect via localhost", [Username]), {C1#stream_connection{connection_step = failure}, @@ -1076,7 +1076,7 @@ handle_frame_pre_auth(_Transport, FrameMax:32, Heartbeat:32>>, Rest) -> - rabbit_log:info("Tuning response ~p ~p ~n", [FrameMax, Heartbeat]), + rabbit_log:debug("Tuning response ~p ~p ", [FrameMax, Heartbeat]), Parent = self(), %% sending a message to the main process so the heartbeat frame is sent from this main process %% otherwise heartbeat frames can interleave with chunk delivery @@ -1149,7 +1149,7 @@ handle_frame_pre_auth(_Transport, rabbit_log:info("Received heartbeat frame pre auth~n"), {Connection, State, Rest}; handle_frame_pre_auth(_Transport, Connection, State, Frame, Rest) -> - rabbit_log:warning("unknown frame ~p ~p, closing connection.~n", + rabbit_log:warning("unknown frame ~p ~p, closing connection.", [Frame, Rest]), {Connection#stream_connection{connection_step = failure}, State, Rest}. @@ -1513,12 +1513,12 @@ handle_frame_post_auth(Transport, {{timestamp, Timestamp}, Crdt} end, rabbit_log:info("Creating subscription ~p to ~p, with offset specificat" - "ion ~p~n", + "ion ~p", [SubscriptionId, Stream, OffsetSpec]), {ok, Segment} = osiris:init_reader(LocalMemberPid, OffsetSpec), - rabbit_log:info("Next offset for subscription ~p is ~p~n", + rabbit_log:info("Next offset for subscription ~p is ~p", [SubscriptionId, osiris_log:next_offset(Segment)]), ConsumerCounters = @@ -1543,7 +1543,7 @@ handle_frame_post_auth(Transport, CorrelationId), rabbit_log:info("Distributing existing messages to subscription " - "~p~n", + "~p", [SubscriptionId]), {{segment, Segment1}, {credit, Credit1}} = send_chunks(Transport, ConsumerState, @@ -1571,7 +1571,7 @@ handle_frame_post_auth(Transport, ConsumerOffset = osiris_log:next_offset(Segment1), rabbit_log:info("Subscription ~p is now at offset ~p with ~p message(s) " - "distributed after subscription~n", + "distributed after subscription", [SubscriptionId, ConsumerOffset, messages_consumed(ConsumerCounters1)]), @@ -1626,7 +1626,7 @@ handle_frame_post_auth(Transport, Consumer1}}, Rest}; _ -> - rabbit_log:warning("Giving credit to unknown subscription: ~p~n", + rabbit_log:warning("Giving credit to unknown subscription: ~p", [SubscriptionId]), Frame = <<?RESPONSE:1, @@ -1663,8 +1663,8 @@ handle_frame_post_auth(_Transport, ok -> case lookup_leader(Stream, Connection) of cluster_not_found -> - rabbit_log:info("Could not find leader to commit offset on ~p~n", - [Stream]), + rabbit_log:warning("Could not find leader to commit offset on ~p", + [Stream]), %% FIXME commit offset is fire-and-forget, so no response even if error, change this? {Connection, State, Rest}; {ClusterLeader, Connection1} -> @@ -1673,7 +1673,7 @@ handle_frame_post_auth(_Transport, end; error -> %% FIXME commit offset is fire-and-forget, so no response even if error, change this? - rabbit_log:info("Not authorized to commit offset on ~p~n", + rabbit_log:info("Not authorized to commit offset on ~p", [Stream]), {Connection, State, Rest} end; @@ -1816,7 +1816,7 @@ handle_frame_post_auth(Transport, {ok, #{leader_pid := LeaderPid, replica_pids := ReturnedReplicas}} -> - rabbit_log:info("Created cluster with leader ~p and replicas ~p~n", + rabbit_log:info("Created cluster with leader ~p and replicas ~p", [LeaderPid, ReturnedReplicas]), response_ok(Transport, Connection, @@ -1981,7 +1981,7 @@ handle_frame_post_auth(Transport, {port, Port}}}, Index + 1}; _ -> - rabbit_log:warning("Error when retrieving broker metadata: ~p ~p~n", + rabbit_log:warning("Error when retrieving broker metadata: ~p ~p", [Host, Port]), {Acc, Index} end @@ -2151,7 +2151,7 @@ handle_frame_post_auth(Transport, ClosingReasonLength:16, ClosingReason:ClosingReasonLength/binary>>, _Rest) -> - rabbit_log:info("Received close command ~p ~p~n", + rabbit_log:info("Received close command ~p ~p", [ClosingCode, ClosingReason]), Frame = <<?RESPONSE:1, @@ -2170,7 +2170,7 @@ handle_frame_post_auth(_Transport, rabbit_log:info("Received heartbeat frame post auth~n"), {Connection, State, Rest}; handle_frame_post_auth(Transport, Connection, State, Frame, Rest) -> - rabbit_log:warning("unknown frame ~p ~p, sending close command.~n", + rabbit_log:warning("unknown frame ~p ~p, sending close command.", [Frame, Rest]), CloseReason = <<"unknown frame">>, CloseReasonLength = byte_size(CloseReason), @@ -2230,7 +2230,7 @@ handle_frame_post_close(_Transport, rabbit_log:info("Received heartbeat frame post close~n"), {Connection, State, Rest}; handle_frame_post_close(_Transport, Connection, State, Frame, Rest) -> - rabbit_log:warning("ignored frame on close ~p ~p.~n", [Frame, Rest]), + rabbit_log:warning("ignored frame on close ~p ~p.", [Frame, Rest]), {Connection, State, Rest}. stream_r(Stream, #stream_connection{virtual_host = VHost}) -> diff --git a/deps/rabbitmq_stream/src/rabbit_stream_utils.erl b/deps/rabbitmq_stream/src/rabbit_stream_utils.erl index 205cc9f6bb..1985c93f20 100644 --- a/deps/rabbitmq_stream/src/rabbit_stream_utils.erl +++ b/deps/rabbitmq_stream/src/rabbit_stream_utils.erl @@ -143,7 +143,7 @@ auth_mechanisms(Sock) -> auth_mechanism_to_module(TypeBin, Sock) -> case rabbit_registry:binary_to_type(TypeBin) of {error, not_found} -> - rabbit_log:warning("Unknown authentication mechanism '~p'~n", + rabbit_log:warning("Unknown authentication mechanism '~p'", [TypeBin]), {error, not_found}; T -> @@ -154,7 +154,7 @@ auth_mechanism_to_module(TypeBin, Sock) -> {true, {ok, Module}} -> {ok, Module}; _ -> - rabbit_log:warning("Invalid authentication mechanism '~p'~n", + rabbit_log:warning("Invalid authentication mechanism '~p'", [T]), {error, invalid} end diff --git a/deps/rabbitmq_tracing/src/rabbit_tracing_consumer.erl b/deps/rabbitmq_tracing/src/rabbit_tracing_consumer.erl index 6bec51de57..7ebe4d0a7a 100644 --- a/deps/rabbitmq_tracing/src/rabbit_tracing_consumer.erl +++ b/deps/rabbitmq_tracing/src/rabbit_tracing_consumer.erl @@ -76,7 +76,7 @@ init(Args0) -> rabbit_tracing_traces:announce(VHost, Name, self()), Format = list_to_atom(binary_to_list(pget(format, Args))), rabbit_log:info("Tracer opened log file ~p with " - "format ~p~n", [Filename, Format]), + "format ~p", [Filename, Format]), {ok, #state{conn = Conn, ch = Ch, vhost = VHost, queue = Q, file = F, filename = Filename, format = Format, buf = [], buf_cnt = 0, @@ -119,7 +119,7 @@ terminate(shutdown, State = #state{conn = Conn, ch = Ch, catch amqp_channel:close(Ch), catch amqp_connection:close(Conn), catch prim_file:close(F), - rabbit_log:info("Tracer closed log file ~p~n", [Filename]), + rabbit_log:info("Tracer closed log file ~p", [Filename]), ok; terminate(_Reason, _State) -> diff --git a/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl b/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl index ed07b1eac8..26806af821 100644 --- a/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl +++ b/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl @@ -238,7 +238,7 @@ refresh_provider_certs(Provider, Config, ProviderState) -> NewProviderState; {error, Reason} -> rabbit_log:error("Unable to load certificate list for provider ~p," - " reason: ~p~n", + " reason: ~p", [Provider, Reason]), ProviderState end. @@ -317,7 +317,7 @@ providers(Config) -> {module, Provider} -> true; {error, Error} -> rabbit_log:warning("Unable to load trust store certificates" - " with provider module ~p. Reason: ~p~n", + " with provider module ~p. Reason: ~p", [Provider, Error]), false end diff --git a/deps/rabbitmq_trust_store/src/rabbit_trust_store_app.erl b/deps/rabbitmq_trust_store/src/rabbit_trust_store_app.erl index 39e549d00c..a5ca630f07 100644 --- a/deps/rabbitmq_trust_store/src/rabbit_trust_store_app.erl +++ b/deps/rabbitmq_trust_store/src/rabbit_trust_store_app.erl @@ -50,7 +50,7 @@ edit(Options) -> Val -> rabbit_log:warning("RabbitMQ trust store plugin is used " "and the verify_fun TLS option is set: ~p. " - "It will be overwritten by the plugin.~n", [Val]), + "It will be overwritten by the plugin.", [Val]), ok end, %% Only enter those options neccessary for this application. diff --git a/deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_registry.erl b/deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_registry.erl index 91d69b8549..6d6621dff4 100644 --- a/deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_registry.erl +++ b/deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_registry.erl @@ -116,7 +116,7 @@ handle_call(list_all, _From, undefined) -> {reply, list(), undefined}; handle_call(Req, _From, State) -> - rabbit_log:error("Unexpected call to ~p: ~p~n", [?MODULE, Req]), + rabbit_log:error("Unexpected call to ~p: ~p", [?MODULE, Req]), {stop, unknown_request, State}. handle_cast(_, State) -> diff --git a/deps/rabbitmq_web_dispatch/src/webmachine_log.erl b/deps/rabbitmq_web_dispatch/src/webmachine_log.erl index dd4da91924..73f67b9c2f 100644 --- a/deps/rabbitmq_web_dispatch/src/webmachine_log.erl +++ b/deps/rabbitmq_web_dispatch/src/webmachine_log.erl @@ -131,7 +131,7 @@ log_access({_, _, _}=LogData) -> %% @doc Close a log file. -spec log_close(atom(), string(), file:io_device()) -> ok | {error, term()}. log_close(Mod, Name, FD) -> - error_logger:info_msg("~p: closing log file: ~p~n", [Mod, Name]), + logger:info("~p: closing log file: ~p", [Mod, Name]), file:close(FD). %% @doc Open a new log file for writing @@ -144,7 +144,7 @@ log_open(FileName) -> -spec log_open(string(), non_neg_integer()) -> file:io_device(). log_open(FileName, DateHour) -> LogName = FileName ++ suffix(DateHour), - error_logger:info_msg("opening log file: ~p~n", [LogName]), + logger:info("opening log file: ~p", [LogName]), filelib:ensure_dir(LogName), {ok, FD} = file:open(LogName, [read, write, raw]), {ok, Location} = file:position(FD, eof), diff --git a/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl b/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl index 1c9f0d79f9..06559921c8 100644 --- a/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl +++ b/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl @@ -116,12 +116,12 @@ start_tcp_listener(TCPConf0, CowboyOpts) -> {error, ErrTCP} -> rabbit_log_connection:error( "Failed to start a WebSocket (HTTP) listener. Error: ~p," - " listener settings: ~p~n", + " listener settings: ~p", [ErrTCP, TCPConf]), throw(ErrTCP) end, listener_started(?TCP_PROTOCOL, TCPConf), - rabbit_log:info("rabbit_web_mqtt: listening for HTTP connections on ~s:~w~n", + rabbit_log:info("rabbit_web_mqtt: listening for HTTP connections on ~s:~w", [IpStr, Port]). start_tls_listener(TLSConf0, CowboyOpts) -> @@ -143,12 +143,12 @@ start_tls_listener(TLSConf0, CowboyOpts) -> {error, ErrTLS} -> rabbit_log_connection:error( "Failed to start a TLS WebSocket (HTTPS) listener. Error: ~p," - " listener settings: ~p~n", + " listener settings: ~p", [ErrTLS, TLSConf]), throw(ErrTLS) end, listener_started(?TLS_PROTOCOL, TLSConf), - rabbit_log:info("rabbit_web_mqtt: listening for HTTPS connections on ~s:~w~n", + rabbit_log:info("rabbit_web_mqtt: listening for HTTPS connections on ~s:~w", [TLSIpStr, TLSPort]). listener_started(Protocol, Listener) -> diff --git a/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl b/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl index 85156a557f..4b1a878bbd 100644 --- a/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl +++ b/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl @@ -85,7 +85,7 @@ websocket_init(State0 = #state{socket = Sock, peername = PeerAddr}) -> conn_name = ConnStr, socket = Sock }, - rabbit_log_connection:info("accepting Web MQTT connection ~p (~s)~n", [self(), ConnStr]), + rabbit_log_connection:info("accepting Web MQTT connection ~p (~s)", [self(), ConnStr]), AdapterInfo = amqp_connection:socket_adapter_info(Sock, {'Web MQTT', "N/A"}), RealSocket = rabbit_net:unwrap_socket(Sock), ProcessorState = rabbit_mqtt_processor:initial_state(Sock, @@ -119,7 +119,7 @@ websocket_handle(Ping, State) when Ping =:= ping; Ping =:= pong -> {ok, State, hibernate}; %% Log any other unexpected frames. websocket_handle(Frame, State) -> - rabbit_log_connection:info("Web MQTT: unexpected WebSocket frame ~p~n", + rabbit_log_connection:info("Web MQTT: unexpected WebSocket frame ~p", [Frame]), {ok, State, hibernate}. @@ -154,12 +154,12 @@ websocket_info({'EXIT', _, _}, State) -> stop(State); websocket_info({'$gen_cast', duplicate_id}, State = #state{ proc_state = ProcState, conn_name = ConnName }) -> - rabbit_log_connection:warning("Web MQTT disconnecting a client with duplicate ID '~s' (~p)~n", + rabbit_log_connection:warning("Web MQTT disconnecting a client with duplicate ID '~s' (~p)", [rabbit_mqtt_processor:info(client_id, ProcState), ConnName]), stop(State); websocket_info({'$gen_cast', {close_connection, Reason}}, State = #state{ proc_state = ProcState, conn_name = ConnName }) -> - rabbit_log_connection:warning("Web MQTT disconnecting client with ID '~s' (~p), reason: ~s~n", + rabbit_log_connection:warning("Web MQTT disconnecting client with ID '~s' (~p), reason: ~s", [rabbit_mqtt_processor:info(client_id, ProcState), ConnName, Reason]), stop(State); websocket_info({start_keepalives, Keepalive}, @@ -172,14 +172,14 @@ websocket_info({start_keepalives, Keepalive}, KeepaliveSup, Sock, 0, SendFun, Keepalive, ReceiveFun), {ok, State #state { keepalive = Heartbeater }, hibernate}; websocket_info(keepalive_timeout, State = #state{conn_name = ConnStr}) -> - rabbit_log_connection:error("closing Web MQTT connection ~p (keepalive timeout)~n", [ConnStr]), + rabbit_log_connection:error("closing Web MQTT connection ~p (keepalive timeout)", [ConnStr]), stop(State); websocket_info(emit_stats, State) -> {ok, emit_stats(State), hibernate}; websocket_info({ra_event, _, _}, State) -> {ok, State, hibernate}; websocket_info(Msg, State) -> - rabbit_log_connection:info("Web MQTT: unexpected message ~p~n", + rabbit_log_connection:info("Web MQTT: unexpected message ~p", [Msg]), {ok, State, hibernate}. @@ -220,7 +220,7 @@ handle_data1(Data, State = #state{ parse_state = ParseState, proc_state = ProcState1, connection = ConnPid }); {error, Reason, _} -> - rabbit_log_connection:info("MQTT protocol error ~p for connection ~p~n", + rabbit_log_connection:info("MQTT protocol error ~p for connection ~p", [Reason, ConnStr]), stop(State, 1002, Reason); {error, Error} -> @@ -242,7 +242,7 @@ stop(State, CloseCode, Error0) -> stop_with_framing_error(State, Error0, ConnStr) -> Error1 = rabbit_misc:format("~p", [Error0]), - rabbit_log_connection:error("MQTT detected framing error '~s' for connection ~p~n", + rabbit_log_connection:error("MQTT detected framing error '~s' for connection ~p", [Error1, ConnStr]), stop(State, 1007, Error1). @@ -250,7 +250,7 @@ stop_rabbit_mqtt_processor(State = #state{state = running, proc_state = ProcState, conn_name = ConnName}) -> maybe_emit_stats(State), - rabbit_log_connection:info("closing Web MQTT connection ~p (~s)~n", [self(), ConnName]), + rabbit_log_connection:info("closing Web MQTT connection ~p (~s)", [self(), ConnName]), rabbit_mqtt_processor:send_will(ProcState), rabbit_mqtt_processor:close_connection(ProcState). diff --git a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl index 74b2e881f2..3a1bcd42cb 100644 --- a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl +++ b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl @@ -226,7 +226,7 @@ websocket_info(emit_stats, State) -> {ok, emit_stats(State)}; websocket_info(Msg, State) -> - rabbit_log_connection:info("Web STOMP: unexpected message ~p~n", + rabbit_log_connection:info("Web STOMP: unexpected message ~p", [Msg]), {ok, State}. @@ -258,7 +258,7 @@ handle_data(Data, State0) -> {[{active, false}], State1}; {error, Error0} -> Error1 = rabbit_misc:format("~p", [Error0]), - rabbit_log_connection:error("STOMP detected framing error '~s'~n", [Error1]), + rabbit_log_connection:error("STOMP detected framing error '~s'", [Error1]), stop(State0, 1007, Error1); Other -> Other diff --git a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl index 68339715a2..0c440463c1 100644 --- a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl +++ b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl @@ -114,13 +114,13 @@ start_tcp_listener(TCPConf0, CowboyOpts0, Routes) -> {error, ErrTCP} -> rabbit_log_connection:error( "Failed to start a WebSocket (HTTP) listener. Error: ~p," - " listener settings: ~p~n", + " listener settings: ~p", [ErrTCP, TCPConf]), throw(ErrTCP) end, listener_started(?TCP_PROTOCOL, TCPConf), rabbit_log_connection:info( - "rabbit_web_stomp: listening for HTTP connections on ~s:~w~n", + "rabbit_web_stomp: listening for HTTP connections on ~s:~w", [get_binding_address(TCPConf), Port]). @@ -152,13 +152,13 @@ start_tls_listener(TLSConf0, CowboyOpts0, Routes) -> {error, ErrTLS} -> rabbit_log_connection:error( "Failed to start a TLS WebSocket (HTTPS) listener. Error: ~p," - " listener settings: ~p~n", + " listener settings: ~p", [ErrTLS, TLSConf]), throw(ErrTLS) end, listener_started(?TLS_PROTOCOL, TLSConf), rabbit_log_connection:info( - "rabbit_web_stomp: listening for HTTPS connections on ~s:~w~n", + "rabbit_web_stomp: listening for HTTPS connections on ~s:~w", [get_binding_address(TLSConf), TLSPort]). listener_started(Protocol, Listener) -> |