From b394d1885232b9c062fad6db36a6c691925cf452 Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 6 May 2022 13:33:03 +0800 Subject: [PATCH] fix(listeners): add limiter info into the listener config --- apps/emqx/src/emqx_listeners.erl | 3 +-- apps/emqx_management/src/emqx_mgmt_api_listeners.erl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl index fcd952696..d4004cbcf 100644 --- a/apps/emqx/src/emqx_listeners.erl +++ b/apps/emqx/src/emqx_listeners.erl @@ -99,8 +99,7 @@ format_raw_listeners({Type0, Conf}) -> Bind = parse_bind(LConf0), Running = is_running(Type, listener_id(Type, LName), LConf0#{bind => Bind}), LConf1 = maps:remove(<<"authentication">>, LConf0), - LConf2 = maps:remove(<<"limiter">>, LConf1), - LConf3 = maps:put(<<"running">>, Running, LConf2), + LConf3 = maps:put(<<"running">>, Running, LConf1), CurrConn = case Running of true -> current_conns(Type, LName, Bind); diff --git a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl index f55f454ed..ed17dd99d 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl @@ -235,8 +235,7 @@ listeners_info(Opts) -> fun({Type, #{type := ?MAP(_Name, ?R_REF(Mod, Field))}}) -> Fields0 = hocon_schema:fields(Mod, Field), Fields1 = lists:keydelete("authentication", 1, Fields0), - Fields2 = lists:keydelete("limiter", 1, Fields1), - Fields3 = required_bind(Fields2, Opts), + Fields3 = required_bind(Fields1, Opts), Ref = listeners_ref(Type, Opts), TypeAtom = list_to_existing_atom(Type), #{