diff --git a/apps/emqx_exhook/i18n/emqx_exhook_api_i18n.conf b/apps/emqx_exhook/i18n/emqx_exhook_api_i18n.conf index a02893c7c..492c2c4ec 100644 --- a/apps/emqx_exhook/i18n/emqx_exhook_api_i18n.conf +++ b/apps/emqx_exhook/i18n/emqx_exhook_api_i18n.conf @@ -133,15 +133,15 @@ NOTE: The position should be \"front | rear | before:{name} | after:{name}""" en: """The status of Exhook server. connected: connection succeeded connecting: connection failed, reconnecting -unconnected: failed to connect and didn't reconnect -disable: this server is disabled +disconnected: failed to connect and didn't reconnect +disabled: this server is disabled error: failed to view the status of this server """ zh: """Exhook 服务器的状态。 connected: 连接成功 connecting: 连接失败,重连中 -unconnected: 连接失败,且未设置自动重连 -disable: 该服务器未开启 +disconnected: 连接失败,且未设置自动重连 +disabled: 该服务器未开启 error: 查看该服务器状态时发生错误""" } } diff --git a/apps/emqx_exhook/src/emqx_exhook_api.erl b/apps/emqx_exhook/src/emqx_exhook_api.erl index ae35ff0a8..89b095b68 100644 --- a/apps/emqx_exhook/src/emqx_exhook_api.erl +++ b/apps/emqx_exhook/src/emqx_exhook_api.erl @@ -186,7 +186,9 @@ fields(node_status) -> [ {node, mk(string(), #{desc => ?DESC(node)})}, {status, - mk(enum([connected, connecting, unconnected, disable, error]), #{desc => ?DESC(status)})} + mk(enum([connected, connecting, disconnected, disabled, error]), #{ + desc => ?DESC(status) + })} ]; fields(hook_info) -> [ diff --git a/apps/emqx_exhook/src/emqx_exhook_mgr.erl b/apps/emqx_exhook/src/emqx_exhook_mgr.erl index ceb5f59e2..c18dd6239 100644 --- a/apps/emqx_exhook/src/emqx_exhook_mgr.erl +++ b/apps/emqx_exhook/src/emqx_exhook_mgr.erl @@ -71,8 +71,8 @@ -type status() :: connected | connecting - | unconnected - | disable. + | disconnected + | disabled. -type server() :: #{ status := status(), @@ -341,7 +341,7 @@ do_load_server(#{name := Name} = Server) -> load_error -> {ok, ensure_reload_timer(Server)}; _ -> - {Error, Server#{status => unconnected}} + {Error, Server#{status => disconnected}} end end. @@ -368,7 +368,7 @@ do_unload_server(Name, #{servers := Servers} = State) -> case where_is_server(Name, State) of not_found -> State; - #{status := disable} -> + #{status := disabled} -> State; Server -> clean_reload_timer(Server), @@ -388,7 +388,7 @@ ensure_reload_timer(#{name := Name, auto_reconnect := Intv} = Server) when is_in Ref = erlang:start_timer(Intv, self(), {reload, Name}), Server#{status := connecting, timer := Ref}; ensure_reload_timer(Server) -> - Server#{status := unconnected}. + Server#{status := disconnected}. -spec clean_reload_timer(server()) -> ok. clean_reload_timer(#{timer := undefined}) -> @@ -516,14 +516,14 @@ refresh_tick() -> erlang:send_after(?REFRESH_INTERVAL, self(), ?FUNCTION_NAME). options_to_server(Options) -> - maps:merge(Options, #{status => unconnected, timer => undefined, order => 0}). + maps:merge(Options, #{status => disconnected, timer => undefined, order => 0}). update_servers(Servers, State) -> update_order(Servers), State#{servers := Servers}. set_disable(Server) -> - Server#{status := disable, timer := undefined}. + Server#{status := disabled, timer := undefined}. %%-------------------------------------------------------------------- %% Server state persistent