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

Merge remote-tracking branch 'origin/develop' into develop-3.2

This commit is contained in:
spring2maz 2019-05-05 12:43:32 +02:00
parent d0131ec663 0a56fc236a
commit b040d37a40
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/emqx.conf
View File

@ -550,6 +550,14 @@ zone.external.acl_deny_action = ignore
## Numbers delimited by `|'. Zero or negative is to disable. ## Numbers delimited by `|'. Zero or negative is to disable.
zone.external.force_gc_policy = 1000|1MB zone.external.force_gc_policy = 1000|1MB
## Max message queue length and total heap size to force shutdown
## connection/session process.
## Message queue here is the Erlang process mailbox, but not the number
## of queued MQTT messages of QoS 1 and 2.
##
## Numbers delimited by `|'. Zero or negative is to disable.
zone.external.force_shutdown_policy = 10000|1024MB
## Maximum MQTT packet size allowed. ## Maximum MQTT packet size allowed.
## ##
## Value: Bytes ## Value: Bytes

8
priv/emqx.schema
View File

@ -400,7 +400,7 @@ end}.
{datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}} {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}}
]}. ]}.
{mapping, "log.primary_level", "emqx.primary_log_level", [ {mapping, "log.primary_level", "kernel.primary_log_level", [
{default, error}, {default, error},
{datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}} {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}}
]}. ]}.
@ -420,7 +420,7 @@ end}.
{datatype, file} {datatype, file}
]}. ]}.
{mapping, "log.chars_limit", "log.chars_limit", [ {mapping, "log.chars_limit", "kernel.logger", [
{default, 1024}, {default, 1024},
{datatype, integer} {datatype, integer}
]}. ]}.
@ -462,10 +462,6 @@ end}.
hidden hidden
]}. ]}.
{translation, "emqx.primary_log_level", fun(Conf) ->
cuttlefish:conf_get("log.level", Conf)
end}.
{translation, "kernel.logger", fun(Conf) -> {translation, "kernel.logger", fun(Conf) ->
LogTo = cuttlefish:conf_get("log.to", Conf), LogTo = cuttlefish:conf_get("log.to", Conf),
LogLevel = cuttlefish:conf_get("log.level", Conf), LogLevel = cuttlefish:conf_get("log.level", Conf),

2
src/emqx_app.erl
View File

@ -31,7 +31,7 @@ start(_Type, _Args) ->
%% kernel config `logger_level` before starting the erlang vm. %% kernel config `logger_level` before starting the erlang vm.
%% This is because the latter approach an annoying debug msg will be printed out: %% This is because the latter approach an annoying debug msg will be printed out:
%% "[debug] got_unexpected_message {'EXIT',<0.1198.0>,normal}" %% "[debug] got_unexpected_message {'EXIT',<0.1198.0>,normal}"
logger:set_primary_config(level, application:get_env(emqx, primary_log_level, error)), logger:set_primary_config(level, application:get_env(kernel, primary_log_level, error)),
print_banner(), print_banner(),
ekka:start(), ekka:start(),