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

Merge pull request #8642 from zhongwencool/fix-node-status 

chore: update Running/Stopped to running/stopped
This commit is contained in:
zhongwencool 2022-08-03 16:32:01 +08:00 committed by GitHub
parent 11165f4a9c fd7c97735d
commit 8e062df809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES-5.0.md
View File

@ -8,6 +8,7 @@
* The license is now copied to all nodes in the cluster when it's reloaded. [#8598](https://github.com/emqx/emqx/pull/8598) * The license is now copied to all nodes in the cluster when it's reloaded. [#8598](https://github.com/emqx/emqx/pull/8598)
* Added a HTTP API to manage licenses. [#8610](https://github.com/emqx/emqx/pull/8610) * Added a HTTP API to manage licenses. [#8610](https://github.com/emqx/emqx/pull/8610)
* Updated `/nodes` API node_status from `Running/Stopped` to `running/stopped`. [#8642](https://github.com/emqx/emqx/pull/8642)
# 5.0.4 # 5.0.4

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

@ -2,7 +2,7 @@
{application, emqx_management, [ {application, emqx_management, [
{description, "EMQX Management API and CLI"}, {description, "EMQX Management API and CLI"},
% strict semver, bump manually! % strict semver, bump manually!
{vsn, "5.0.2"}, {vsn, "5.0.3"},
{modules, []}, {modules, []},
{registered, [emqx_management_sup]}, {registered, [emqx_management_sup]},
{applications, [kernel, stdlib, emqx_plugins, minirest, emqx]}, {applications, [kernel, stdlib, emqx_plugins, minirest, emqx]},

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

@ -138,7 +138,7 @@ node_info() ->
max_fds, lists:usort(lists:flatten(erlang:system_info(check_io))) max_fds, lists:usort(lists:flatten(erlang:system_info(check_io)))
), ),
connections => ets:info(emqx_channel, size), connections => ets:info(emqx_channel, size),
node_status => 'Running', node_status => 'running',
uptime => proplists:get_value(uptime, BrokerInfo), uptime => proplists:get_value(uptime, BrokerInfo),
version => iolist_to_binary(proplists:get_value(version, BrokerInfo)), version => iolist_to_binary(proplists:get_value(version, BrokerInfo)),
role => mria_rlog:role() role => mria_rlog:role()
@ -156,7 +156,7 @@ node_info(Node) ->
wrap_rpc(emqx_management_proto_v2:node_info(Node)). wrap_rpc(emqx_management_proto_v2:node_info(Node)).
stopped_node_info(Node) -> stopped_node_info(Node) ->
#{name => Node, node_status => 'Stopped'}. #{name => Node, node_status => 'stopped'}.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Brokers %% Brokers

11
apps/emqx_management/src/emqx_mgmt_api_nodes.erl
View File

@ -189,8 +189,8 @@ fields(node_info) ->
)}, )},
{node_status, {node_status,
mk( mk(
enum(['Running', 'Stopped']), enum(['running', 'stopped']),
#{desc => <<"Node status">>, example => "Running"} #{desc => <<"Node status">>, example => "running"}
)}, )},
{otp_release, {otp_release,
mk( mk(
@ -288,19 +288,18 @@ get_stats(Node) ->
%% internal function %% internal function
format(_Node, Info = #{memory_total := Total, memory_used := Used}) -> format(_Node, Info = #{memory_total := Total, memory_used := Used}) ->
{ok, SysPathBinary} = file:get_cwd(), RootDir = list_to_binary(code:root_dir()),
SysPath = list_to_binary(SysPathBinary),
LogPath = LogPath =
case log_path() of case log_path() of
undefined -> undefined ->
<<"log.file_handler.default.enable is false,only log to console">>; <<"log.file_handler.default.enable is false,only log to console">>;
Path -> Path ->
filename:join(SysPath, Path) filename:join(RootDir, Path)
end, end,
Info#{ Info#{
memory_total := emqx_mgmt_util:kmg(Total), memory_total := emqx_mgmt_util:kmg(Total),
memory_used := emqx_mgmt_util:kmg(Used), memory_used := emqx_mgmt_util:kmg(Used),
sys_path => SysPath, sys_path => RootDir,
log_path => LogPath log_path => LogPath
}. }.