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

Merge pull request #2600 from emqx/fix_log 

Fix set log level fail
This commit is contained in:
turtleDeng 2019-06-06 11:28:08 +08:00 committed by GitHub
parent 84bf926524 ba027f39dd
commit fddbc74d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -9,7 +9,7 @@ dep_jsx = git-emqx https://github.com/talentdeficit/jsx 2.9.0
dep_gproc = git-emqx https://github.com/uwiger/gproc 0.8.0 dep_gproc = git-emqx https://github.com/uwiger/gproc 0.8.0
dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1 dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1
dep_esockd = git-emqx https://github.com/emqx/esockd v5.4.4 dep_esockd = git-emqx https://github.com/emqx/esockd v5.4.4
dep_ekka = git-emqx https://github.com/emqx/ekka v0.5.4 dep_ekka = git-emqx https://github.com/emqx/ekka v0.5.5
dep_cowboy = git-emqx https://github.com/ninenines/cowboy 2.6.1 dep_cowboy = git-emqx https://github.com/ninenines/cowboy 2.6.1
dep_replayq = git-emqx https://github.com/emqx/replayq v0.1.1 dep_replayq = git-emqx https://github.com/emqx/replayq v0.1.1
@ -18,7 +18,7 @@ NO_AUTOPATCH = cuttlefish
ERLC_OPTS += +debug_info -DAPPLICATION=emqx ERLC_OPTS += +debug_info -DAPPLICATION=emqx
BUILD_DEPS = cuttlefish BUILD_DEPS = cuttlefish
dep_cuttlefish = git-emqx https://github.com/emqx/cuttlefish v2.2.1 dep_cuttlefish = git-emqx https://github.com/emqx/cuttlefish v2.2.2
CUR_BRANCH := $(shell git branch | grep -e "^*" | cut -d' ' -f 2) CUR_BRANCH := $(shell git branch | grep -e "^*" | cut -d' ' -f 2)
BRANCH := $(if $(filter $(CUR_BRANCH), master develop), $(CUR_BRANCH), develop) BRANCH := $(if $(filter $(CUR_BRANCH), master develop), $(CUR_BRANCH), develop)

6
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", "kernel.primary_log_level", [ {mapping, "log.primary_log_level", "kernel.logger_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]}}
]}. ]}.
@ -462,6 +462,10 @@ end}.
hidden hidden
]}. ]}.
{translation, "kernel.logger_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),

4
rebar.config
View File

@ -5,10 +5,10 @@
%% appended to deps in rebar.config.script %% appended to deps in rebar.config.script
{github_emqx_libs, {github_emqx_libs,
[{gen_rpc, "2.3.1"}, [{gen_rpc, "2.3.1"},
{ekka, "v0.5.4"}, {ekka, "v0.5.5"},
{replayq, "v0.1.1"}, {replayq, "v0.1.1"},
{esockd, "v5.4.4"}, {esockd, "v5.4.4"},
{cuttlefish, "v2.2.1"}]}. {cuttlefish, "v2.2.2"}]}.
{github_emqx_projects, {github_emqx_projects,
[{emqx_ct_helpers, "v1.0"}]}. [{emqx_ct_helpers, "v1.0"}]}.

6
src/emqx_app.erl
View File

@ -27,12 +27,6 @@
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
start(_Type, _Args) -> start(_Type, _Args) ->
%% We'd like to configure the primary logger level here, rather than set the
%% kernel config `logger_level` before starting the erlang vm.
%% This is because the latter approach an annoying debug msg will be printed out:
%% "[debug] got_unexpected_message {'EXIT',<0.1198.0>,normal}"
logger:set_primary_config(level, application:get_env(kernel, primary_log_level, error)),
print_banner(), print_banner(),
ekka:start(), ekka:start(),
{ok, Sup} = emqx_sup:start_link(), {ok, Sup} = emqx_sup:start_link(),