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

chore(config): rename log.use_json_formatter to log.formatter

This commit is contained in:
Zaiming Shi 2021-05-05 19:56:27 +02:00 committed by Zaiming (Stone) Shi
parent 6b0487d69d
commit 81da075b9b
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/emqx.conf
View File

@ -444,9 +444,9 @@ log.file = emqx.log
## Default: No Limit ## Default: No Limit
#log.chars_limit = 8192 #log.chars_limit = 8192
## Log as JSON objects ## Log formatter
## Value: boolean ## Value: text | json
#log.use_json_formatter = false #log.formatter = text
## Log to single line ## Log to single line
## Value: formatter_default | true | false ## Value: formatter_default | true | false

21
priv/emqx.schema
View File

@ -499,9 +499,9 @@ end}.
]}. ]}.
%% @doc format logs as JSON objects %% @doc format logs as JSON objects
{mapping, "log.use_json_formatter", "kernel.logger", [ {mapping, "log.formatter", "kernel.logger", [
{default, false}, {default, text},
{datatype, {enum, [true, false]}} {datatype, {enum, [text, json]}}
]}. ]}.
%% @doc format logs in a single line. %% @doc format logs in a single line.
@ -607,22 +607,23 @@ end}.
V -> V V -> V
end, end,
SingleLine0 = cuttlefish:conf_get("log.single_line", Conf), SingleLine0 = cuttlefish:conf_get("log.single_line", Conf),
AsJson = cuttlefish:conf_get("log.use_json_formatter", Conf), FmtName = cuttlefish:conf_get("log.formatter", Conf),
SingleLine = case SingleLine0 =:= formatter_default of SingleLine = case SingleLine0 =:= formatter_default of
true -> true when FmtName =:= text ->
%% single-line when logging in JSON format false;
AsJson; true when FmtName =:= json ->
true;
false -> false ->
SingleLine0 SingleLine0
end, end,
Formatter = Formatter =
case AsJson of case FmtName of
true -> json ->
{emqx_logger_jsonfmt, {emqx_logger_jsonfmt,
#{chars_limit => CharsLimit, #{chars_limit => CharsLimit,
single_line => SingleLine single_line => SingleLine
}}; }};
false -> text ->
{emqx_logger_textfmt, {emqx_logger_textfmt,
#{template => #{template =>
[time," [",level,"] ", [time," [",level,"] ",