Просмотр исходного кода

fix(limiter): improved log content

firest 1 год назад
Родитель
Сommit
7a7bd84cba

+ 4 - 6
apps/emqx/src/emqx_connection.erl

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

+ 4 - 6
apps/emqx/src/emqx_ws_connection.erl

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

+ 1 - 1
apps/emqx_conf/src/emqx_conf_schema.erl

@@ -85,7 +85,7 @@
     cannot_publish_to_topic_due_to_quota_exceeded,
     connection_rejected_due_to_license_limit_reached,
     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.

+ 1 - 1
changes/ce/feat-13009.en.md

@@ -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.