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

fix(emqx_congestion): read congestion config only from zone

This commit is contained in:
Shawn 2021-07-19 18:47:24 +08:00
parent 2898e9c6dc
commit e0e9b7ec5b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx/src/emqx_congestion.erl
View File

@ -56,8 +56,7 @@ cancel_alarms(Socket, Transport, Channel) ->
is_alarm_enabled(Channel) -> is_alarm_enabled(Channel) ->
Zone = emqx_channel:info(zone, Channel), Zone = emqx_channel:info(zone, Channel),
Listener = emqx_channel:info(listener, Channel), emqx_config:get_zone_conf(Zone, [conn_congestion, enable_alarm]).
emqx_config:get_listener_conf(Zone, Listener, [conn_congestion, enable_alarm]).
alarm_congestion(Socket, Transport, Channel, Reason) -> alarm_congestion(Socket, Transport, Channel, Reason) ->
case has_alarm_sent(Reason) of case has_alarm_sent(Reason) of
@ -69,8 +68,7 @@ alarm_congestion(Socket, Transport, Channel, Reason) ->
cancel_alarm_congestion(Socket, Transport, Channel, Reason) -> cancel_alarm_congestion(Socket, Transport, Channel, Reason) ->
Zone = emqx_channel:info(zone, Channel), Zone = emqx_channel:info(zone, Channel),
Listener = emqx_channel:info(listener, Channel), WontClearIn = emqx_config:get_zone_conf(Zone, [conn_congestion,
WontClearIn = emqx_config:get_listener_conf(Zone, Listener, [conn_congestion,
min_alarm_sustain_duration]), min_alarm_sustain_duration]),
case has_alarm_sent(Reason) andalso long_time_since_last_alarm(Reason, WontClearIn) of case has_alarm_sent(Reason) andalso long_time_since_last_alarm(Reason, WontClearIn) of
true -> do_cancel_alarm_congestion(Socket, Transport, Channel, Reason); true -> do_cancel_alarm_congestion(Socket, Transport, Channel, Reason);