From 4e62aff3ab2fedad7455492f71ca7c4c47943f40 Mon Sep 17 00:00:00 2001 From: Zhongwen Deng Date: Thu, 29 Dec 2022 11:08:16 +0800 Subject: [PATCH] fix: bad best fmt json [] --- apps/emqx/src/emqx.app.src | 2 +- apps/emqx/src/emqx_logger_jsonfmt.erl | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src index c281b11cc..bd7617e74 100644 --- a/apps/emqx/src/emqx.app.src +++ b/apps/emqx/src/emqx.app.src @@ -3,7 +3,7 @@ {id, "emqx"}, {description, "EMQX Core"}, % strict semver, bump manually! - {vsn, "5.0.13"}, + {vsn, "5.0.14"}, {modules, []}, {registered, []}, {applications, [ diff --git a/apps/emqx/src/emqx_logger_jsonfmt.erl b/apps/emqx/src/emqx_logger_jsonfmt.erl index 03adeed04..af740337b 100644 --- a/apps/emqx/src/emqx_logger_jsonfmt.erl +++ b/apps/emqx/src/emqx_logger_jsonfmt.erl @@ -221,7 +221,7 @@ best_effort_json_obj(Map, Config) -> end. json([], _) -> - "[]"; + ""; json(<<"">>, _) -> "\"\""; json(A, _) when is_atom(A) -> atom_to_binary(A, utf8); @@ -376,4 +376,19 @@ p_config() -> ] ). +best_effort_json_test() -> + ?assertEqual( + <<"{}">>, + emqx_logger_jsonfmt:best_effort_json([]) + ), + ?assertEqual( + <<"{\n \"key\": []\n}">>, + emqx_logger_jsonfmt:best_effort_json(#{key => []}) + ), + ?assertEqual( + <<"[\n {\n \"key\": []\n }\n]">>, + emqx_logger_jsonfmt:best_effort_json([#{key => []}]) + ), + ok. + -endif.