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

chore: bypass emqx_authn's listener change

This commit is contained in:
Zhongwen Deng 2022-04-20 02:32:32 +08:00
parent c70462f287
commit a131535c60
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx/src/emqx_listeners.erl
View File

@ -363,7 +363,9 @@ pre_config_update([listeners, _Type, _Name], {update, _Request}, undefined) ->
pre_config_update([listeners, Type, Name], {update, Request}, RawConf) -> pre_config_update([listeners, Type, Name], {update, Request}, RawConf) ->
NewConf = emqx_map_lib:deep_merge(RawConf, Request), NewConf = emqx_map_lib:deep_merge(RawConf, Request),
CertsDir = certs_dir(Type, Name), CertsDir = certs_dir(Type, Name),
{ok, convert_certs(CertsDir, NewConf)}. {ok, convert_certs(CertsDir, NewConf)};
pre_config_update(_Path, _Request, RawConf) ->
{ok, RawConf}.
post_config_update([listeners, Type, Name], {create, _Request}, NewConf, undefined, _AppEnvs) -> post_config_update([listeners, Type, Name], {create, _Request}, NewConf, undefined, _AppEnvs) ->
start_listener(Type, Name, NewConf); start_listener(Type, Name, NewConf);
@ -378,7 +380,9 @@ post_config_update([listeners, Type, Name], '$remove', undefined, OldConf, _AppE
CertsDir = certs_dir(Type, Name), CertsDir = certs_dir(Type, Name),
clear_certs(CertsDir, OldConf); clear_certs(CertsDir, OldConf);
Err -> Err Err -> Err
end. end;
post_config_update(_Path, _Request, _NewConf, _OldConf, _AppEnvs) ->
ok.
esockd_opts(Type, Opts0) -> esockd_opts(Type, Opts0) ->
Opts1 = maps:with([acceptors, max_connections, proxy_protocol, proxy_protocol_timeout], Opts0), Opts1 = maps:with([acceptors, max_connections, proxy_protocol, proxy_protocol_timeout], Opts0),