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

Merge pull request #8096 from zmstone/0531-fix-mac-mem-stat 

fix(emqx_mgmt): return 0 for non-linux systems
This commit is contained in:
zhouzb 2022-05-31 20:55:53 +08:00 committed by GitHub
parent 020c612b46 a2db7226c9
commit 78adeea297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ list_nodes() ->
lookup_node(Node) -> node_info(Node). lookup_node(Node) -> node_info(Node).
node_info() -> node_info() ->
{UsedRatio, Total} = load_ctl:get_sys_memory(), {UsedRatio, Total} = get_sys_memory(),
Info = maps:from_list([{K, list_to_binary(V)} || {K, V} <- emqx_vm:loads()]), Info = maps:from_list([{K, list_to_binary(V)} || {K, V} <- emqx_vm:loads()]),
BrokerInfo = emqx_sys:info(), BrokerInfo = emqx_sys:info(),
Info#{ Info#{
@ -142,6 +142,14 @@ node_info() ->
role => mria_rlog:role() role => mria_rlog:role()
}. }.
get_sys_memory() ->
case os:type() of
{unix, linux} ->
load_ctl:get_sys_memory();
_ ->
{0, 0}
end.
node_info(Node) -> node_info(Node) ->
wrap_rpc(emqx_management_proto_v1:node_info(Node)). wrap_rpc(emqx_management_proto_v1:node_info(Node)).