From e0e9b7ec5bad7455139c03597c5ba92985aa369a Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 19 Jul 2021 18:47:24 +0800
Subject: [PATCH] fix(emqx_congestion): read congestion config only from zone

---
 apps/emqx/src/emqx_congestion.erl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/src/emqx_congestion.erl b/apps/emqx/src/emqx_congestion.erl
index f7e30c1da..f0db5415f 100644
--- a/apps/emqx/src/emqx_congestion.erl
+++ b/apps/emqx/src/emqx_congestion.erl
@@ -56,8 +56,7 @@ cancel_alarms(Socket, Transport, Channel) ->
 
 is_alarm_enabled(Channel) ->
     Zone = emqx_channel:info(zone, Channel),
-    Listener = emqx_channel:info(listener, Channel),
-    emqx_config:get_listener_conf(Zone, Listener, [conn_congestion, enable_alarm]).
+    emqx_config:get_zone_conf(Zone, [conn_congestion, enable_alarm]).
 
 alarm_congestion(Socket, Transport, Channel, Reason) ->
     case has_alarm_sent(Reason) of
@@ -69,8 +68,7 @@ alarm_congestion(Socket, Transport, Channel, Reason) ->
 
 cancel_alarm_congestion(Socket, Transport, Channel, Reason) ->
     Zone = emqx_channel:info(zone, Channel),
-    Listener = emqx_channel:info(listener, Channel),
-    WontClearIn = emqx_config:get_listener_conf(Zone, Listener, [conn_congestion,
+    WontClearIn = emqx_config:get_zone_conf(Zone, [conn_congestion,
                     min_alarm_sustain_duration]),
     case has_alarm_sent(Reason) andalso long_time_since_last_alarm(Reason, WontClearIn) of
         true -> do_cancel_alarm_congestion(Socket, Transport, Channel, Reason);