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

Merge pull request #10959 from qzhuyan/dev/william/remove-depre-quic-config 

chore: remove deprecated QUIC listener config
This commit is contained in:
zhongwencool 2023-06-14 23:01:00 +08:00 committed by GitHub
parent bd269e259e 8fa743fa22
commit 41004e86da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,10 +421,7 @@ do_start_listener(quic, ListenerName, #{bind := Bind} = Opts) ->
case [A || {quicer, _, _} = A <- application:which_applications()] of case [A || {quicer, _, _} = A <- application:which_applications()] of
[_] -> [_] ->
DefAcceptors = erlang:system_info(schedulers_online) * 8, DefAcceptors = erlang:system_info(schedulers_online) * 8,
SSLOpts = maps:merge( SSLOpts = maps:get(ssl_options, Opts, #{}),
maps:with([certfile, keyfile], Opts),
maps:get(ssl_options, Opts, #{})
),
ListenOpts = ListenOpts =
[ [
{certfile, emqx_schema:naive_env_interpolation(maps:get(certfile, SSLOpts))}, {certfile, emqx_schema:naive_env_interpolation(maps:get(certfile, SSLOpts))},

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

@ -739,7 +739,7 @@ fields("mqtt_quic_listener") ->
sc( sc(
string(), string(),
#{ #{
%% TODO: deprecated => {since, "5.1.0"} deprecated => {since, "5.1.0"},
desc => ?DESC(fields_mqtt_quic_listener_certfile), desc => ?DESC(fields_mqtt_quic_listener_certfile),
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_HIDDEN
} }
@ -748,7 +748,7 @@ fields("mqtt_quic_listener") ->
sc( sc(
string(), string(),
#{ #{
%% TODO: deprecated => {since, "5.1.0"} deprecated => {since, "5.1.0"},
desc => ?DESC(fields_mqtt_quic_listener_keyfile), desc => ?DESC(fields_mqtt_quic_listener_keyfile),
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_HIDDEN
} }
@ -827,7 +827,7 @@ fields("mqtt_quic_listener") ->
#{ #{
default => 0, default => 0,
desc => ?DESC(fields_mqtt_quic_listener_idle_timeout), desc => ?DESC(fields_mqtt_quic_listener_idle_timeout),
%% TODO: deprecated => {since, "5.1.0"} deprecated => {since, "5.1.0"},
%% deprecated, use idle_timeout_ms instead %% deprecated, use idle_timeout_ms instead
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_HIDDEN
} }
@ -844,7 +844,7 @@ fields("mqtt_quic_listener") ->
#{ #{
default => <<"10s">>, default => <<"10s">>,
desc => ?DESC(fields_mqtt_quic_listener_handshake_idle_timeout), desc => ?DESC(fields_mqtt_quic_listener_handshake_idle_timeout),
%% TODO: deprecated => {since, "5.1.0"} deprecated => {since, "5.1.0"},
%% use handshake_idle_timeout_ms %% use handshake_idle_timeout_ms
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_HIDDEN
} }