From 6710a508df280e25cffb987c3f225d008cd6b407 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Thu, 15 Apr 2021 20:10:09 +0800 Subject: [PATCH] fix(exhook): correct the exhook server anme --- apps/emqx_exhook/src/emqx_exhook.erl | 1 + apps/emqx_exhook/src/emqx_exhook_server.erl | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/emqx_exhook/src/emqx_exhook.erl b/apps/emqx_exhook/src/emqx_exhook.erl index 5b601a74d..fd28d3c8d 100644 --- a/apps/emqx_exhook/src/emqx_exhook.erl +++ b/apps/emqx_exhook/src/emqx_exhook.erl @@ -36,6 +36,7 @@ %% Mgmt APIs %%-------------------------------------------------------------------- +%% XXX: Only return the running servers -spec list() -> [emqx_exhook_server:server()]. list() -> [server(Name) || Name <- running()]. diff --git a/apps/emqx_exhook/src/emqx_exhook_server.erl b/apps/emqx_exhook/src/emqx_exhook_server.erl index 5a353b61b..dd670c540 100644 --- a/apps/emqx_exhook/src/emqx_exhook_server.erl +++ b/apps/emqx_exhook/src/emqx_exhook_server.erl @@ -83,7 +83,7 @@ -spec load(atom(), list()) -> {ok, server()} | {error, term()} . load(Name0, Opts0) -> - Name = prefix(Name0), + Name = to_list(Name0), {SvrAddr, ClientOpts} = channel_opts(Opts0), case emqx_exhook_sup:start_grpc_client_channel( Name, @@ -110,12 +110,12 @@ load(Name0, Opts0) -> end. %% @private -prefix(Name) when is_atom(Name) -> - "exhook:" ++ atom_to_list(Name); -prefix(Name) when is_binary(Name) -> - "exhook:" ++ binary_to_list(Name); -prefix(Name) when is_list(Name) -> - "exhook:" ++ Name. +to_list(Name) when is_atom(Name) -> + atom_to_list(Name); +to_list(Name) when is_binary(Name) -> + binary_to_list(Name); +to_list(Name) when is_list(Name) -> + Name. %% @private channel_opts(Opts) ->