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

fix(conf): change `max_topic_levels` default configuration

This commit is contained in:
JimMoen 2021-11-24 19:08:43 +08:00
parent 47b2642423
commit e57c30a0b9
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/emqx.conf
View File

@ -202,9 +202,11 @@ mqtt.max_packet_size = 1MB
mqtt.max_clientid_len = 65535 mqtt.max_clientid_len = 65535
## Maximum topic levels allowed. 0 means no limit. ## Maximum topic levels allowed. 0 means no limit.
## Depth so big may lead to subscribing performance issues.
## ##
## Value: Number ## Value: Number [0-65535]
mqtt.max_topic_levels = 0 ## Default: 128
mqtt.max_topic_levels = 128
## Maximum QoS allowed. ## Maximum QoS allowed.
## ##
@ -242,7 +244,7 @@ mqtt.ignore_loop_deliver = false
mqtt.strict_mode = false mqtt.strict_mode = false
## Specify the response information returned to the client ## Specify the response information returned to the client
## ##
## Value: String ## Value: String
## mqtt.response_information = example ## mqtt.response_information = example

10
etc/zones.conf
View File

@ -57,9 +57,11 @@ zone.external.force_shutdown_policy = 10000|32MB
## zone.external.max_clientid_len = 1024 ## zone.external.max_clientid_len = 1024
## Maximum topic levels allowed. 0 means no limit. ## Maximum topic levels allowed. 0 means no limit.
## Depth so big may lead to subscribing performance issues.
## ##
## Value: Number ## Value: Number [0-65535]
## zone.external.max_topic_levels = 7 ## Default 7
zone.external.max_topic_levels = 7
## Maximum QoS allowed. ## Maximum QoS allowed.
## ##
@ -250,7 +252,7 @@ zone.external.ignore_loop_deliver = false
zone.external.strict_mode = false zone.external.strict_mode = false
## Specify the response information returned to the client ## Specify the response information returned to the client
## ##
## Value: String ## Value: String
## zone.external.response_information = example ## zone.external.response_information = example
@ -341,7 +343,7 @@ zone.internal.ignore_loop_deliver = false
zone.internal.strict_mode = false zone.internal.strict_mode = false
## Specify the response information returned to the client ## Specify the response information returned to the client
## ##
## Value: String ## Value: String
## zone.internal.response_information = example ## zone.internal.response_information = example

2
priv/emqx.schema
View File

@ -757,7 +757,7 @@ end}.
%% @doc Set the Maximum topic levels. %% @doc Set the Maximum topic levels.
{mapping, "mqtt.max_topic_levels", "emqx.max_topic_levels", [ {mapping, "mqtt.max_topic_levels", "emqx.max_topic_levels", [
{default, 0}, {default, 128},
{datatype, integer} {datatype, integer}
]}. ]}.

3
test/emqx_channel_SUITE.erl
View File

@ -82,7 +82,7 @@ t_chan_caps(_) ->
#{max_clientid_len := 65535, #{max_clientid_len := 65535,
max_qos_allowed := 2, max_qos_allowed := 2,
max_topic_alias := 65535, max_topic_alias := 65535,
max_topic_levels := 0, max_topic_levels := 128,
retain_available := true, retain_available := true,
shared_subscription := true, shared_subscription := true,
subscription_identifiers := true, subscription_identifiers := true,
@ -768,4 +768,3 @@ session(InitFields) when is_map(InitFields) ->
quota() -> quota() ->
emqx_limiter:init(zone, [{conn_messages_routing, {5, 1}}, emqx_limiter:init(zone, [{conn_messages_routing, {5, 1}},
{overall_messages_routing, {10, 1}}]). {overall_messages_routing, {10, 1}}]).