diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl index 9bf981323..6c2a02e47 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard.erl @@ -73,6 +73,7 @@ start_listeners(Listeners) -> Dispatch = [ {"/", cowboy_static, {priv_file, emqx_dashboard, "www/index.html"}}, {"/static/[...]", cowboy_static, {priv_dir, emqx_dashboard, "www/static"}}, + {emqx_mgmt_api_status:path(), emqx_mgmt_api_status, []}, {?BASE_PATH ++ "/[...]", emqx_dashboard_bad_api, []}, {'_', cowboy_static, {priv_file, emqx_dashboard, "www/index.html"}} ], diff --git a/apps/emqx_management/src/emqx_mgmt_api_status.erl b/apps/emqx_management/src/emqx_mgmt_api_status.erl index 5ece0bda4..70ff98988 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_status.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_status.erl @@ -14,55 +14,25 @@ %% limitations under the License. %%-------------------------------------------------------------------- -module(emqx_mgmt_api_status). -%% API --behaviour(minirest_api). -export([ - api_spec/0, - paths/0, - schema/1 + init/2, + path/0 ]). --export([running_status/2]). +path() -> + "/status". -api_spec() -> - emqx_dashboard_swagger:spec(?MODULE, #{check_schema => true}). - -paths() -> - ["/status"]. - -schema("/status") -> - #{ - 'operationId' => running_status, - get => - #{ - description => <<"Node running status">>, - tags => [<<"Status">>], - security => [], - responses => - #{ - 200 => - #{ - description => <<"Node is running">>, - content => - #{ - 'text/plain' => - #{ - schema => #{type => string}, - example => - <<"Node emqx@127.0.0.1 is started\nemqx is running">> - } - } - } - } - } - }. +init(Req0, State) -> + {Code, Headers, Body} = running_status(), + Req = cowboy_req:reply(Code, Headers, Body, Req0), + {ok, Req, State}. %%-------------------------------------------------------------------- %% API Handler funcs %%-------------------------------------------------------------------- -running_status(get, _Params) -> +running_status() -> BrokerStatus = case emqx:is_running() of true ->