diff --git a/etc/emqx.conf b/etc/emqx.conf index 0162fae7c..99934f3ab 100644 --- a/etc/emqx.conf +++ b/etc/emqx.conf @@ -820,12 +820,12 @@ zone.internal.mqueue_store_qos0 = true ## Value: on | off zone.internal.enable_flapping_detect = off -## See zone.$name.force_shutdown_policy -## -## Default: -## - 10000|32MB on ARCH_64 system -## - 10000|16MB on ARCH_32 sytem -zone.internal.force_shutdown_policy = 100000|64MB +# ## See zone.$name.force_shutdown_policy +# ## +# ## Default: +# ## - 10000|32MB on ARCH_64 system +# ## - 10000|16MB on ARCH_32 sytem +# zone.internal.force_shutdown_policy = 100000|64MB ## All the topics will be prefixed with the mountpoint path if this option is enabled. ## diff --git a/priv/emqx.schema b/priv/emqx.schema index bbd0fb4ab..527e36a7a 100644 --- a/priv/emqx.schema +++ b/priv/emqx.schema @@ -923,7 +923,6 @@ end}. %% of queued MQTT messages of QoS 1 and 2. %% Zero or negative is to disable. {mapping, "zone.$name.force_shutdown_policy", "emqx.zones", [ - {default, "default"}, {datatype, string} ]}. @@ -963,17 +962,6 @@ end}. count => list_to_integer(Count)} end, {force_gc_policy, GcPolicy}; - ("force_shutdown_policy", "default") -> - {DefaultLen, DefaultSize} = - case WordSize = erlang:system_info(wordsize) of - 8 -> % arch_64 - {10000, cuttlefish_bytesize:parse("32MB")}; - 4 -> % arch_32 - {10000, cuttlefish_bytesize:parse("16MB")} - end, - {force_shutdown_policy, #{message_queue_len => DefaultLen, - max_heap_size => DefaultSize div WordSize - }}; ("force_shutdown_policy", Val) -> [Len, Siz] = string:tokens(Val, "| "), MaxSiz = case WordSize = erlang:system_info(wordsize) of