feat: add option to gc after TLS/SSL handshake (4.3)
Port of https://github.com/emqx/emqx/pull/8637
This commit is contained in:
parent
5a9e8a23b3
commit
5e9462afc8
|
@ -16,6 +16,7 @@ File format:
|
||||||
|
|
||||||
- Upgrade Erlang/OTP from 23.2.7.2-emqx-3 to 23.3.4.9-3 [#8511](https://github.com/emqx/emqx/pull/8511)
|
- Upgrade Erlang/OTP from 23.2.7.2-emqx-3 to 23.3.4.9-3 [#8511](https://github.com/emqx/emqx/pull/8511)
|
||||||
- Make possible to debug-print SSL handshake procedure by setting listener config `log_level=debug` [#8553](https://github.com/emqx/emqx/pull/8553)
|
- Make possible to debug-print SSL handshake procedure by setting listener config `log_level=debug` [#8553](https://github.com/emqx/emqx/pull/8553)
|
||||||
|
- Add option to perform GC on connection process after TLS/SSL handshake is performed. [#8649](https://github.com/emqx/emqx/pull/8649)
|
||||||
|
|
||||||
## v4.3.17
|
## v4.3.17
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{plugins, [rebar3_proper]}.
|
{plugins, [rebar3_proper]}.
|
||||||
|
|
||||||
{deps,
|
{deps,
|
||||||
[{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.5"}}},
|
[{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.7"}}},
|
||||||
{cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.0.0"}}}
|
{cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.0.0"}}}
|
||||||
]}.
|
]}.
|
||||||
|
|
||||||
|
|
|
@ -1644,6 +1644,13 @@ listener.ssl.external.ciphers = TLS_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256,TL
|
||||||
## Value: true | false
|
## Value: true | false
|
||||||
listener.ssl.external.reuseaddr = true
|
listener.ssl.external.reuseaddr = true
|
||||||
|
|
||||||
|
## Whether to perform GC after TLS/SSL handshake.
|
||||||
|
##
|
||||||
|
## Default: false
|
||||||
|
##
|
||||||
|
## Value: true | false
|
||||||
|
## listener.ssl.external.gc_after_handshake = false
|
||||||
|
|
||||||
##--------------------------------------------------------------------
|
##--------------------------------------------------------------------
|
||||||
## External WebSocket listener for MQTT protocol
|
## External WebSocket listener for MQTT protocol
|
||||||
|
|
||||||
|
|
|
@ -1599,6 +1599,11 @@ end}.
|
||||||
{datatype, {enum, [emergency, alert, critical, error, warning, notice, info, debug, none, all]}}
|
{datatype, {enum, [emergency, alert, critical, error, warning, notice, info, debug, none, all]}}
|
||||||
]}.
|
]}.
|
||||||
|
|
||||||
|
{mapping, "listener.ssl.$name.gc_after_handshake", "emqx.listeners", [
|
||||||
|
{default, false},
|
||||||
|
{datatype, {enum, [true, false]}}
|
||||||
|
]}.
|
||||||
|
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% MQTT/WebSocket Listeners
|
%% MQTT/WebSocket Listeners
|
||||||
|
|
||||||
|
@ -2055,6 +2060,7 @@ end}.
|
||||||
{datatype, {enum, [emergency, alert, critical, error, warning, notice, info, debug, none, all]}}
|
{datatype, {enum, [emergency, alert, critical, error, warning, notice, info, debug, none, all]}}
|
||||||
]}.
|
]}.
|
||||||
|
|
||||||
|
|
||||||
{translation, "emqx.listeners", fun(Conf) ->
|
{translation, "emqx.listeners", fun(Conf) ->
|
||||||
|
|
||||||
Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end,
|
Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end,
|
||||||
|
@ -2221,7 +2227,8 @@ end}.
|
||||||
{secure_renegotiate, cuttlefish:conf_get(Prefix ++ ".secure_renegotiate", Conf, undefined)},
|
{secure_renegotiate, cuttlefish:conf_get(Prefix ++ ".secure_renegotiate", Conf, undefined)},
|
||||||
{reuse_sessions, cuttlefish:conf_get(Prefix ++ ".reuse_sessions", Conf, undefined)},
|
{reuse_sessions, cuttlefish:conf_get(Prefix ++ ".reuse_sessions", Conf, undefined)},
|
||||||
{honor_cipher_order, cuttlefish:conf_get(Prefix ++ ".honor_cipher_order", Conf, undefined)},
|
{honor_cipher_order, cuttlefish:conf_get(Prefix ++ ".honor_cipher_order", Conf, undefined)},
|
||||||
{log_level, cuttlefish:conf_get(Prefix ++ ".log_level", Conf, undefined)}
|
{log_level, cuttlefish:conf_get(Prefix ++ ".log_level", Conf, undefined)},
|
||||||
|
{gc_after_handshake, cuttlefish:conf_get(Prefix ++ ".gc_after_handshake", Conf, undefined)}
|
||||||
])
|
])
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
, {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
|
, {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
|
||||||
, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
|
, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
|
||||||
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
|
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
|
||||||
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.6"}}}
|
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.7"}}}
|
||||||
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.1.11"}}}
|
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.1.11"}}}
|
||||||
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.2"}}}
|
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.2"}}}
|
||||||
, {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.3.6"}}}
|
, {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.3.6"}}}
|
||||||
|
|
Loading…
Reference in New Issue