From d84a3fe291fdcd04eef3c32ca9a193d4f9988e48 Mon Sep 17 00:00:00 2001 From: k32 <10274441+k32@users.noreply.github.com> Date: Thu, 13 Jan 2022 00:58:31 +0100 Subject: [PATCH] refactor(emqx_conf): Decorate get_override_config_file --- apps/emqx_conf/src/emqx_conf_app.erl | 2 +- apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/emqx_conf/src/emqx_conf_app.erl b/apps/emqx_conf/src/emqx_conf_app.erl index 63baa3ed8..2d29285bc 100644 --- a/apps/emqx_conf/src/emqx_conf_app.erl +++ b/apps/emqx_conf/src/emqx_conf_app.erl @@ -44,7 +44,7 @@ copy_override_conf_from_core_node() -> ?SLOG(debug, #{msg => "skip_copy_overide_conf_from_core_node"}), {ok, -1}; Nodes -> - {Results, Failed} = rpc:multicall(Nodes, ?MODULE, get_override_config_file, [], 20000), + {Results, Failed} = emqx_conf_proto_v1:get_override_config_file(Nodes), {Ready, NotReady0} = lists:partition(fun(Res) -> element(1, Res) =:= ok end, Results), NotReady = lists:filter(fun(Res) -> element(1, Res) =:= error end, NotReady0), case (Failed =/= [] orelse NotReady =/= []) andalso Ready =/= [] of diff --git a/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl b/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl index 1aa6973c3..e935ed5c6 100644 --- a/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl +++ b/apps/emqx_conf/src/proto/emqx_conf_proto_v1.erl @@ -31,6 +31,8 @@ , reset/2 , reset/3 + + , get_override_config_file/1 ]). -include_lib("emqx/include/bpapi.hrl"). @@ -89,3 +91,7 @@ reset(KeyPath, Opts) -> | emqx_rpc:badrpc(). reset(Node, KeyPath, Opts) -> rpc:call(Node, emqx, reset_config, [KeyPath, Opts]). + +-spec get_override_config_file([node()]) -> emqx_rpc:multicall_result(). +get_override_config_file(Nodes) -> + rpc:multicall(Nodes, emqx_conf_app, get_override_config_file, [], 20000).