From a583c221f0abacda5dea9c9069462804584981dc Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 17 Aug 2022 22:51:02 +0800 Subject: [PATCH 1/2] fix: list_listener crash with invaild json --- CHANGES-4.3.md | 3 ++- apps/emqx_management/src/emqx_mgmt_api_listeners.erl | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index babc8cb17..ea45e0d69 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -22,7 +22,8 @@ File format: ### Bug fixes - Fix GET `/auth_clientid` and `/auth_username` counts. [#8655](https://github.com/emqx/emqx/pull/8655) -- Add a idle timer for ExProto UDP client to avoid client leaking [#8628](https://github.com/emqx/emqx/pull/8628) +- Add an idle timer for ExProto UDP client to avoid client leaking [#8628](https://github.com/emqx/emqx/pull/8628) +- Fix GET `/listeners/` crashes when listener is not ready. [#8752](https://github.com/emqx/emqx/pull/8752) ## v4.3.18 diff --git a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl index 461c91d84..10ad9f4d4 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl @@ -72,5 +72,4 @@ format(Listeners) when is_list(Listeners) -> [ Info#{listen_on => list_to_binary(esockd:to_string(ListenOn))} || Info = #{listen_on := ListenOn} <- Listeners ]; -format({error, Reason}) -> [{error, Reason}]. - +format({error, Reason}) -> [{error, iolist_to_binary(io_lib:format("~p", [Reason]))}]. From 8a78c8a2f548d40d9478e1958c3135bafa725943 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 17 Aug 2022 23:37:50 +0800 Subject: [PATCH 2/2] chore: add emqx_app to 4.3.19 --- src/emqx.appup.src | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/emqx.appup.src b/src/emqx.appup.src index fe65271fc..5b6b88e61 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -2,7 +2,8 @@ %% Unless you know what you are doing, DO NOT edit manually!! {VSN, [{"4.3.19", - [{load_module,emqx_cm,brutal_purge,soft_purge,[]}, + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]}]}, {"4.3.18", @@ -696,7 +697,8 @@ {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], [{"4.3.19", - [{load_module,emqx_cm,brutal_purge,soft_purge,[]}, + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]}]}, {"4.3.18",