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

Merge pull request #8110 from DDDHuang/log_adapter 

fix: adjust old logger config
This commit is contained in:
JianBo He 2022-06-01 16:14:49 +08:00 committed by GitHub
parent 2050d9601b 4347fa1b95
commit 3fa341642c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
priv/emqx.schema
View File

@ -666,7 +666,7 @@ end}.
#{ #{
date_format => DateFormat, date_format => DateFormat,
template => template =>
[" [",level,"] ", [time," [",level,"] ",
{clientid, {clientid,
[{peername, [{peername,
[clientid,"@",peername," "], [clientid,"@",peername," "],

22
src/emqx_logger_textfmt.erl
View File

@ -32,13 +32,18 @@ check_config(Config0) ->
Config = maps:without([date_format], Config0), Config = maps:without([date_format], Config0),
logger_formatter:check_config(Config). logger_formatter:check_config(Config).
format(#{msg := Msg0, meta := Meta} = Event, format(Event, Config) ->
#{date_format := rfc3339, template := Template0} = Config) -> case maps:get(date_format, Config, rfc3339) of
rfc3339 ->
format(Event, Config, rfc3339);
DateFormatString ->
format(Event, Config, DateFormatString)
end.
format(#{msg := Msg0, meta := Meta} = Event, Config, rfc3339) ->
Msg = maybe_merge(Msg0, Meta), Msg = maybe_merge(Msg0, Meta),
Template = [time | Template0], logger_formatter:format(Event#{msg := Msg}, Config);
logger_formatter:format(Event#{msg := Msg}, Config#{template => Template}); format(#{msg := Msg0, meta := Meta} = Event, #{template := Template} = Config, DFS) ->
format(#{msg := Msg0, meta := Meta} = Event,
#{date_format := DFS} = Config) ->
Msg = maybe_merge(Msg0, Meta), Msg = maybe_merge(Msg0, Meta),
Time = Time =
case maps:get(time, Event, undefined) of case maps:get(time, Event, undefined) of
@ -48,7 +53,10 @@ format(#{msg := Msg0, meta := Meta} = Event,
T T
end, end,
Date = emqx_calendar:format(Time, microsecond, local, DFS), Date = emqx_calendar:format(Time, microsecond, local, DFS),
[Date | logger_formatter:format(Event#{msg := Msg}, Config)]. [Date | logger_formatter:format(Event#{msg := Msg}, Config#{template => remove_time(Template)})].
remove_time([time | Tail]) -> Tail;
remove_time(Template) -> Template.
maybe_merge({report, Report}, Meta) when is_map(Report) -> maybe_merge({report, Report}, Meta) when is_map(Report) ->
{report, maps:merge(Report, filter(Meta))}; {report, maps:merge(Report, filter(Meta))};