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

fix(API): fix get used memory error

This commit is contained in:
Turtle 2021-05-29 09:41:04 +08:00 committed by turtleDeng
parent 7b43a23734
commit cf4cbc1677
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_management/src/emqx_management.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_management, {application, emqx_management,
[{description, "EMQ X Management API and CLI"}, [{description, "EMQ X Management API and CLI"},
{vsn, "4.3.2"}, % strict semver, bump manually! {vsn, "4.3.3"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_management_sup]}, {registered, [emqx_management_sup]},
{applications, [kernel,stdlib,minirest]}, {applications, [kernel,stdlib,minirest]},

26
apps/emqx_management/src/emqx_management.appup.src
View File

@ -1,14 +1,24 @@
%% -*-: erlang -*- %% -*-: erlang -*-
{"4.3.2", {VSN,
[ {<<"4.3.[0-1]">>, [ {"4.3.2",
[ {load_module, emqx_mgmt_data_backup, brutal_purge, soft_purge, []} [ {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
, {load_module, emqx_mgmt_cli, brutal_purge, soft_purge, []} ]},
]}
],
[
{<<"4.3.[0-1]">>, {<<"4.3.[0-1]">>,
[ {load_module, emqx_mgmt_data_backup, brutal_purge, soft_purge, []} [ {load_module, emqx_mgmt_data_backup, brutal_purge, soft_purge, []}
, {load_module, emqx_mgmt_cli, brutal_purge, soft_purge, []} , {load_module, emqx_mgmt_cli, brutal_purge, soft_purge, []}
]} , {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
]},
{<<".*">>, []}
],
[
{"4.3.2",
[ {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
]},
{<<"4.3.[0-1]">>,
[ {load_module, emqx_mgmt_data_backup, brutal_purge, soft_purge, []}
, {load_module, emqx_mgmt_cli, brutal_purge, soft_purge, []}
, {load_module, emqx_mgmt, brutal_purge, soft_purge, []}
]},
{<<".*">>, []}
] ]
}. }.

2
apps/emqx_management/src/emqx_mgmt.erl
View File

@ -139,7 +139,7 @@ node_info(Node) when Node =:= node() ->
Info#{node => node(), Info#{node => node(),
otp_release => iolist_to_binary(otp_rel()), otp_release => iolist_to_binary(otp_rel()),
memory_total => proplists:get_value(allocated, Memory), memory_total => proplists:get_value(allocated, Memory),
memory_used => proplists:get_value(used, Memory), memory_used => proplists:get_value(total, Memory),
process_available => erlang:system_info(process_limit), process_available => erlang:system_info(process_limit),
process_used => erlang:system_info(process_count), process_used => erlang:system_info(process_count),
max_fds => proplists:get_value(max_fds, lists:usort(lists:flatten(erlang:system_info(check_io)))), max_fds => proplists:get_value(max_fds, lists:usort(lists:flatten(erlang:system_info(check_io)))),