From 6c465cfb8f89fe5e1859b8eba58d6503f332898f Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 13 Jun 2022 17:43:06 +0800 Subject: [PATCH] fix(gw): fix list listeners failed if gateway disabled --- apps/emqx_gateway/src/emqx_gateway_api_listeners.erl | 9 ++++++++- apps/emqx_gateway/src/emqx_gateway_insta_sup.erl | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl b/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl index 1e851d1c4..0db5264b8 100644 --- a/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl +++ b/apps/emqx_gateway/src/emqx_gateway_api_listeners.erl @@ -292,7 +292,14 @@ do_listeners_cluster_status(Listeners) -> fun({Id, ListenOn}, Acc) -> BinId = erlang:atom_to_binary(Id), {ok, #{<<"max_connections">> := Max}} = emqx_gateway_conf:listener(BinId), - Curr = esockd:get_current_connections({Id, ListenOn}), + Curr = + try esockd:get_current_connections({Id, ListenOn}) of + Int -> Int + catch + %% not started + error:not_found -> + 0 + end, Acc#{ Id => #{ node => Node, diff --git a/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl b/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl index c47b8a050..08c06a9d8 100644 --- a/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl +++ b/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl @@ -173,14 +173,14 @@ handle_info( ) -> case lists:member(Pid, Pids) of true -> - ?SLOG(error, #{ + ?SLOG(info, #{ msg => "child_process_exited", child => Pid, reason => Reason }), case Pids -- [Pid] of [] -> - ?SLOG(error, #{ + ?SLOG(info, #{ msg => "gateway_all_children_process_existed", gateway_name => Name }), @@ -193,7 +193,7 @@ handle_info( {noreply, State#state{child_pids = RemainPids}} end; _ -> - ?SLOG(error, #{ + ?SLOG(info, #{ msg => "gateway_catch_a_unknown_process_exited", child => Pid, reason => Reason,