From 49bf7a7db19c2c78e485f02229946118e27f1955 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Tue, 16 May 2023 13:49:34 +0800 Subject: [PATCH] chore: improve some logs in emqx_connection --- src/emqx_connection.erl | 7 ++----- src/emqx_ws_connection.erl | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/emqx_connection.erl b/src/emqx_connection.erl index 35ae98331..ac9d40ac1 100644 --- a/src/emqx_connection.erl +++ b/src/emqx_connection.erl @@ -654,13 +654,10 @@ parse_incoming(Data, Packets, State = #state{parse_state = ParseState}) -> parse_incoming(Rest, [Packet | Packets], NState) catch error:proxy_protocol_config_disabled:_Stk -> - ?LOG(error, - "~nMalformed packet, " - "please check proxy_protocol config for specific listeners and zones~n"), + ?LOG(error, "Received proxy protocol header but the 'proxy_protocol' config is disabled"), {[{frame_error, proxy_protocol_config_disabled} | Packets], State}; error:Reason:Stk -> - ?LOG(error, "~nParse failed for ~0p~n~0p~nFrame data:~0p", - [Reason, Stk, Data]), + ?LOG(error, "Parse failed for ~0p, ~0p, Frame data: ~0p", [Reason, Stk, Data]), {[{frame_error, Reason} | Packets], State} end. diff --git a/src/emqx_ws_connection.erl b/src/emqx_ws_connection.erl index 1597c9b71..c94f58b24 100644 --- a/src/emqx_ws_connection.erl +++ b/src/emqx_ws_connection.erl @@ -201,7 +201,7 @@ init(Req, Opts) -> case check_origin_header(Req, Opts) of {error, Message} -> - ?LOG(error, "Invalid Origin Header ~p~n", [Message]), + ?LOG(error, "Invalid Origin Header ~p", [Message]), {ok, cowboy_req:reply(403, Req), WsOpts}; ok -> parse_sec_websocket_protocol(Req, Opts, WsOpts) end. @@ -408,7 +408,7 @@ websocket_info(Info, State) -> websocket_close({_, ReasonCode, _Payload}, State) when is_integer(ReasonCode) -> websocket_close(ReasonCode, State); websocket_close(Reason, State) -> - ?LOG(debug, "Websocket closed due to ~p~n", [Reason]), + ?LOG(debug, "Websocket closed due to ~p", [Reason]), handle_info({sock_closed, Reason}, State). terminate(Reason, _Req, #state{channel = Channel}) -> @@ -554,7 +554,7 @@ parse_incoming(Data, State = #state{parse_state = ParseState}) -> parse_incoming(Rest, postpone({incoming, Packet}, NState)) catch error:Reason:Stk -> - ?LOG(error, "~nParse failed for ~0p~n~0p~nFrame data: ~0p", + ?LOG(error, "Parse failed for ~0p, ~0p, Frame data: ~0p", [Reason, Stk, Data]), FrameError = {frame_error, Reason}, postpone({incoming, FrameError}, State)