Przeglądaj źródła

fix(API): fix get used memory error

Turtle 4 lat temu
rodzic
commit
cf4cbc1677

+ 1 - 1
apps/emqx_management/src/emqx_management.app.src

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

+ 14 - 4
apps/emqx_management/src/emqx_management.appup.src

@@ -1,14 +1,24 @@
 %% -*-: erlang -*-
-{"4.3.2",
- [ {<<"4.3.[0-1]">>,
+{VSN,
+ [ {"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, []}
+    ]},
+   {<<".*">>, []}
  ],
  [
+   {"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, []}
+    ]},
+   {<<".*">>, []}
  ]
 }.

+ 1 - 1
apps/emqx_management/src/emqx_mgmt.erl

@@ -139,7 +139,7 @@ node_info(Node) when Node =:= node() ->
     Info#{node              => node(),
           otp_release       => iolist_to_binary(otp_rel()),
           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_used      => erlang:system_info(process_count),
           max_fds           => proplists:get_value(max_fds, lists:usort(lists:flatten(erlang:system_info(check_io)))),