From 8041524d208c16072ecada8c62bd50f50a4af3d2 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Sat, 29 Jan 2022 10:31:38 +0800 Subject: [PATCH] chore(dashboard): warning wehn stop dashboard listener not found. --- apps/emqx_dashboard/src/emqx_dashboard.erl | 10 +++++++--- apps/emqx_dashboard/src/emqx_dashboard_schema.erl | 4 ++-- mix.exs | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl index faa6784e0..1777dbd86 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard.erl @@ -80,9 +80,13 @@ start_listeners() -> stop_listeners() -> [begin - _ = minirest:stop(Name), - ?ULOG("Stop listener ~ts on ~p successfully.~n", [Name, Port]) - end || {Name, _, Port, _} <- listeners()]. + case minirest:stop(Name) of + ok -> + ?ULOG("Stop listener ~ts on ~p successfully.~n", [Name, Port]); + {error, not_found} -> + ?SLOG(warning, #{msg => "stop_listener_failed", name => Name, port => Port}) + end + end || {Name, _, Port, _} <- listeners()]. %%-------------------------------------------------------------------- %% internal diff --git a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl index e8ead7431..eb1d79f45 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_schema.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_schema.erl @@ -29,8 +29,8 @@ fields("dashboard") -> sc(hoconsc:array(hoconsc:union([hoconsc:ref(?MODULE, "http"), hoconsc:ref(?MODULE, "https")])), #{ desc => -"""HTTP(s) listeners identified by their protocol type, -is used to serve dashboard UI and restful HTTP API.
+"""HTTP(s) listeners are identified by their protocol type and are +used to serve dashboard UI and restful HTTP API.
Listeners must have a unique combination of port number and IP address.
For example, an HTTP listener can listen on all configured IP addresses on a given port for a machine by specifying the IP address 0.0.0.0.
diff --git a/mix.exs b/mix.exs index dfab72031..70861952e 100644 --- a/mix.exs +++ b/mix.exs @@ -48,7 +48,7 @@ defmodule EMQXUmbrella.MixProject do {:mria, github: "emqx/mria", tag: "0.1.5", override: true}, {:ekka, github: "emqx/ekka", tag: "0.11.3", override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.0", override: true}, - {:minirest, github: "emqx/minirest", tag: "1.2.10", override: true}, + {:minirest, github: "emqx/minirest", tag: "1.2.11", override: true}, {:ecpool, github: "emqx/ecpool", tag: "0.5.2"}, {:replayq, "0.3.3", override: true}, {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},