Merge branch 'develop' into force_shutdown

emqx · May 7, 2019 · 98da807 · 98da807
2 parents 25ce875 + b4c659f
commit 98da807
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/etc/emqx.conf b/etc/emqx.conf
@@ -371,8 +371,8 @@ log.file = emqx.log
 ## Limits the total number of characters printed for each log event.
 ##
 ## Value: Integer
-## Default: 1024
-log.chars_limit = 1024
+## Default: 8192
+log.chars_limit = 8192
 
 ## Maximum size of each log file.
 ##

diff --git 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", "emqx.primary_log_level", [
+{mapping, "log.primary_level", "kernel.primary_log_level", [
    {default, error},
    {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}}
 ]}.
@@ -420,8 +420,8 @@ end}.
   {datatype, file}
 ]}.
 
-{mapping, "log.chars_limit", "log.chars_limit", [
-  {default, 1024},
+{mapping, "log.chars_limit", "kernel.logger", [
+  {default, 8192},
   {datatype, integer}
 ]}.
 
@@ -462,10 +462,6 @@ end}.
   hidden
 ]}.
 
-{translation, "emqx.primary_log_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/src/emqx_app.erl b/src/emqx_app.erl
@@ -31,7 +31,7 @@ start(_Type, _Args) ->
     %%   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(emqx, primary_log_level, error)),
+    logger:set_primary_config(level, application:get_env(kernel, primary_log_level, error)),
 
     print_banner(),
     ekka:start(),

diff --git a/src/emqx_stats.erl b/src/emqx_stats.erl
@@ -73,6 +73,8 @@
 -define(PUBSUB_STATS, [
     'topics/count',
     'topics/max',
+    'suboptions/count',
+    'suboptions/max',
     'subscribers/count',
     'subscribers/max',
     'subscriptions/count',
@@ -242,9 +244,12 @@ code_change(_OldVsn, State, _Extra) ->
 %%------------------------------------------------------------------------------
 
 safe_update_element(Key, Val) ->
-    try ets:update_element(?TAB, Key, {2, Val})
+    try ets:update_element(?TAB, Key, {2, Val}) of
+        false ->
+            ets:insert_new(?TAB, {Key, Val});
+        true ->
+            true
     catch
         error:badarg ->
-            ets:insert_new(?TAB, {Key, Val})
+            ?LOG(warning, "[Stats] Update ~p to ~p failed", [Key, Val])
     end.
-