From dfa63ff3b1fa444f2c7089da7f4ac284e764b966 Mon Sep 17 00:00:00 2001 From: firest Date: Mon, 15 Aug 2022 10:22:18 +0800 Subject: [PATCH 1/3] fix(mgmt): remove the `will_msg` field from the client API --- apps/emqx_management/src/emqx_mgmt_api_clients.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl index 0fd158dbd..19bf63f66 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl @@ -538,7 +538,6 @@ fields(client) -> })}, {username, hoconsc:mk(binary(), #{desc => <<"User name of client when connecting">>})}, {mountpoint, hoconsc:mk(binary(), #{desc => <<"Topic mountpoint">>})}, - {will_msg, hoconsc:mk(binary(), #{desc => <<"Client will message">>})}, {zone, hoconsc:mk(binary(), #{ desc => @@ -885,7 +884,8 @@ format_channel_info({_, ClientInfo0, ClientStats}) -> [memory, next_pkt_id, total_heap_size], maps:from_list(ClientStats) ), - ClientInfoMap0 = maps:fold(fun take_maps_from_inner/3, #{}, ClientInfo2), + ClientInfo3 = maps:remove(will_msg, ClientInfo2), + ClientInfoMap0 = maps:fold(fun take_maps_from_inner/3, #{}, ClientInfo3), {IpAddress, Port} = peername_dispart(maps:get(peername, ClientInfoMap0)), Connected = maps:get(conn_state, ClientInfoMap0) =:= connected, ClientInfoMap1 = maps:merge(StatsMap, ClientInfoMap0), From 403346ea7c7ac3a8d20abe9a43fda8a9ee5e935f Mon Sep 17 00:00:00 2001 From: firest Date: Mon, 15 Aug 2022 11:39:28 +0800 Subject: [PATCH 2/3] chore: update CHANGES-5.0.md --- CHANGES-5.0.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index 734b88515..af29aeac7 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -1,3 +1,9 @@ +# 5.0.6 + +## Bug fixes + +* remove the `will_msg` field from the client API + # 5.0.5 ## Bug fixes From 367449ee6fc26f9ce331c20c5b94d55141f4807a Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 15 Aug 2022 14:47:52 +0800 Subject: [PATCH 3/3] chore: update CHANGES-5.0.md --- CHANGES-5.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index af29aeac7..bf9afb3fb 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -2,7 +2,7 @@ ## Bug fixes -* remove the `will_msg` field from the client API +* Remove the needless `will_msg` field from the client API. [#8721](https://github.com/emqx/emqx/pull/8721) # 5.0.5