From 91f787533dbba30ab3dfb9e2ebab5a59e326f986 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Sat, 21 Aug 2021 11:36:35 +0800 Subject: [PATCH] fix(log): text formatter crash ``` (emqx@127.0.0.1)1> logger:error("abc"). ok 2021-08-20T18:10:01.180622+08:00 error: FORMATTER CRASH: {string,"abc"} ``` --- apps/emqx/src/emqx_logger_textfmt.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/emqx/src/emqx_logger_textfmt.erl b/apps/emqx/src/emqx_logger_textfmt.erl index cf419f381..94af0ca2a 100644 --- a/apps/emqx/src/emqx_logger_textfmt.erl +++ b/apps/emqx/src/emqx_logger_textfmt.erl @@ -23,17 +23,17 @@ check_config(X) -> logger_formatter:check_config(X). format(#{msg := {report, Report}, meta := Meta} = Event, Config) when is_map(Report) -> logger_formatter:format(Event#{msg := {report, enrich(Report, Meta)}}, Config); -format(#{msg := {Fmt, Args}, meta := Meta} = Event, Config) when is_list(Fmt) -> - {NewFmt, NewArgs} = enrich_fmt(Fmt, Args, Meta), - logger_formatter:format(Event#{msg := {NewFmt, NewArgs}}, Config). +format(#{msg := Msg, meta := Meta} = Event, Config) -> + NewMsg = enrich_fmt(Msg, Meta), + logger_formatter:format(Event#{msg := NewMsg}, Config). enrich(Report, #{mfa := Mfa, line := Line}) -> Report#{mfa => mfa(Mfa), line => Line}; enrich(Report, _) -> Report. -enrich_fmt(Fmt, Args, #{mfa := Mfa, line := Line}) -> +enrich_fmt({Fmt, Args}, #{mfa := Mfa, line := Line}) when is_list(Fmt) -> {Fmt ++ " mfa: ~s line: ~w", Args ++ [mfa(Mfa), Line]}; -enrich_fmt(Fmt, Args, _) -> - {Fmt, Args}. +enrich_fmt(Msg, _) -> + Msg. mfa({M, F, A}) -> atom_to_list(M) ++ ":" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A).