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

fix(emqx_logger_jsonfmt): corner test case

This commit is contained in:
Zaiming Shi 2021-05-07 19:05:58 +02:00 committed by Zaiming (Stone) Shi
parent 05324dfd7c
commit 18cd7e7af5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/emqx_logger_jsonfmt.erl
View File

@ -207,17 +207,16 @@ json_kv(K0, V, Data, Config) ->
false -> maps:put(json(K, Config), json(V, Config), Data) false -> maps:put(json(K, Config), json(V, Config), Data)
end. end.
json_key('' = K) -> throw({badkey, K}); json_key(A) when is_atom(A) -> json_key(atom_to_binary(A, utf8));
json_key("" = K) -> throw({badkey, K});
json_key("\"\"" = K) -> throw({badkey, K});
json_key(<<>> = K) -> throw({badkey, K});
json_key(<<"\"\"">> = K) -> throw({badkey, K});
json_key(A) when is_atom(A) -> atom_to_binary(A, utf8);
json_key(Term) -> json_key(Term) ->
try unicode:characters_to_binary(Term, utf8) of try unicode:characters_to_binary(Term, utf8) of
OK when is_binary(OK) -> OK; OK when is_binary(OK) andalso OK =/= <<>> ->
_ -> throw({badkey, Term}) OK;
catch _:_ -> throw({badkey, Term}) _ ->
throw({badkey, Term})
catch
_:_ ->
throw({badkey, Term})
end. end.
-ifdef(TEST). -ifdef(TEST).
@ -262,7 +261,7 @@ p_report_cb() ->
, fun ?MODULE:report_cb_crash/2 , fun ?MODULE:report_cb_crash/2
, fun logger:format_otp_report/1 , fun logger:format_otp_report/1
, fun logger:format_report/1 , fun logger:format_report/1
, format_reportundefined , format_report_undefined
]). ]).
report_cb_1(Input) -> {"~p", [Input]}. report_cb_1(Input) -> {"~p", [Input]}.