yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(limiter): improved log content

This commit is contained in:
firest 2024-05-14 15:34:13 +08:00
parent bd7ccc3546
commit 7a7bd84cba
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx/src/emqx_connection.erl
View File

@ -1022,9 +1022,8 @@ check_limiter(
?SLOG_THROTTLE( ?SLOG_THROTTLE(
warning, warning,
#{ #{
msg => pause_time_due_to_rate_limit, msg => socket_receive_paused_by_rate_limit,
needs => Needs, paused_ms => Time
time_in_ms => Time
}, },
#{ #{
tag => "RATE", tag => "RATE",
@ -1081,9 +1080,8 @@ retry_limiter(#state{channel = Channel, limiter = Limiter} = State) ->
?SLOG_THROTTLE( ?SLOG_THROTTLE(
warning, warning,
#{ #{
msg => pause_time_due_to_rate_limit, msg => socket_receive_paused_by_rate_limit,
types => Types, paused_ms => Time
time_in_ms => Time
}, },
#{ #{
tag => "RATE", tag => "RATE",

10
apps/emqx/src/emqx_ws_connection.erl
View File

@ -609,9 +609,8 @@ check_limiter(
?SLOG_THROTTLE( ?SLOG_THROTTLE(
warning, warning,
#{ #{
msg => pause_time_due_to_rate_limit, msg => socket_receive_paused_by_rate_limit,
needs => Needs, paused_ms => Time
time_in_ms => Time
}, },
#{ #{
tag => "RATE", tag => "RATE",
@ -669,9 +668,8 @@ retry_limiter(#state{channel = Channel, limiter = Limiter} = State) ->
?SLOG_THROTTLE( ?SLOG_THROTTLE(
warning, warning,
#{ #{
msg => pause_time_due_to_rate_limit, msg => socket_receive_paused_by_rate_limit,
types => Types, paused_ms => Time
time_in_ms => Time
}, },
#{ #{
tag => "RATE", tag => "RATE",

2
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -85,7 +85,7 @@
cannot_publish_to_topic_due_to_quota_exceeded, cannot_publish_to_topic_due_to_quota_exceeded,
connection_rejected_due_to_license_limit_reached, connection_rejected_due_to_license_limit_reached,
dropped_msg_due_to_mqueue_is_full, dropped_msg_due_to_mqueue_is_full,
pause_time_due_to_rate_limit socket_receive_paused_by_rate_limit
]). ]).
%% Callback to upgrade config after loaded from config file but before validation. %% Callback to upgrade config after loaded from config file but before validation.

2
changes/ce/feat-13009.en.md
View File

@ -1 +1 @@
Lifted the log level of rate limiter to `warning`. Changed the log level of message receive pause from `debug` to `warning`. The log message `socket_receive_paused_by_rate_limit` is throttled to avoid excessive logging.