From ba027f39dd33623cadf366e6c5eb1d50dced6360 Mon Sep 17 00:00:00 2001
From: turtled <turtled@emqtt.io>
Date: Thu, 6 Jun 2019 11:27:29 +0800
Subject: [PATCH] Fix set log level fail

---
 Makefile         | 4 ++--
 priv/emqx.schema | 6 +++++-
 rebar.config     | 4 ++--
 src/emqx_app.erl | 6 ------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index acb854fa4..40cbb8226 100644
--- a/Makefile
+++ b/Makefile
@@ -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_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_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_replayq = git-emqx https://github.com/emqx/replayq v0.1.1
 
@@ -18,7 +18,7 @@ NO_AUTOPATCH = cuttlefish
 ERLC_OPTS += +debug_info -DAPPLICATION=emqx
 
 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)
 BRANCH := $(if $(filter $(CUR_BRANCH), master develop), $(CUR_BRANCH), develop)
diff --git a/priv/emqx.schema b/priv/emqx.schema
index 804ab041d..19a62e17e 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -400,7 +400,7 @@ end}.
   {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},
    {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}}
 ]}.
@@ -462,6 +462,10 @@ end}.
   hidden
 ]}.
 
+{translation, "kernel.logger_level", fun(_, _, Conf) ->
+    cuttlefish:conf_get("log.level", Conf)
+end}.
+
 {translation, "kernel.logger", fun(Conf) ->
     LogTo = cuttlefish:conf_get("log.to", Conf),
     LogLevel = cuttlefish:conf_get("log.level", Conf),
diff --git a/rebar.config b/rebar.config
index 8db9caa3e..7399608f1 100644
--- a/rebar.config
+++ b/rebar.config
@@ -5,10 +5,10 @@
 %% appended to deps in rebar.config.script
 {github_emqx_libs,
  [{gen_rpc, "2.3.1"},
-  {ekka, "v0.5.4"},
+  {ekka, "v0.5.5"},
   {replayq, "v0.1.1"},
   {esockd, "v5.4.4"},
-  {cuttlefish, "v2.2.1"}]}.
+  {cuttlefish, "v2.2.2"}]}.
 
 {github_emqx_projects,
  [{emqx_ct_helpers, "v1.0"}]}.
diff --git a/src/emqx_app.erl b/src/emqx_app.erl
index bc9d58408..47075922b 100644
--- a/src/emqx_app.erl
+++ b/src/emqx_app.erl
@@ -27,12 +27,6 @@
 %%--------------------------------------------------------------------
 
 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(),
     ekka:start(),
     {ok, Sup} = emqx_sup:start_link(),