yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ensure plugin config map after fresh install

This commit is contained in:
JimMoen 2024-05-23 16:31:58 +08:00
parent 398dc97ed6
commit 99869821fb
No known key found for this signature in database
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqx_plugins/src/emqx_plugins.erl
View File

@ -161,6 +161,7 @@ ensure_installed(NameVsn) ->
ok = purge(NameVsn), ok = purge(NameVsn),
case ensure_exists_and_installed(NameVsn) of case ensure_exists_and_installed(NameVsn) of
ok -> ok ->
_ = maybe_ensure_plugin_config(NameVsn),
maybe_post_op_after_installed(NameVsn); maybe_post_op_after_installed(NameVsn);
{error, _Reason} = Err -> {error, _Reason} = Err ->
Err Err
@ -1167,7 +1168,9 @@ ensure_plugin_config(NameVsn, Nodes) ->
case get_plugin_config_from_any_node(Nodes, NameVsn, []) of case get_plugin_config_from_any_node(Nodes, NameVsn, []) of
{ok, ConfigMap} when is_map(ConfigMap) -> {ok, ConfigMap} when is_map(ConfigMap) ->
HoconBin = hocon_pp:do(ConfigMap, #{}), HoconBin = hocon_pp:do(ConfigMap, #{}),
ok = file:write_file(plugin_config_file(NameVsn), HoconBin), Path = plugin_config_file(NameVsn),
ok = filelib:ensure_dir(Path),
ok = file:write_file(Path, HoconBin),
ensure_config_map(NameVsn); ensure_config_map(NameVsn);
_ -> _ ->
?SLOG(error, #{msg => "config_not_found_from_cluster", name_vsn => NameVsn}), ?SLOG(error, #{msg => "config_not_found_from_cluster", name_vsn => NameVsn}),
@ -1184,9 +1187,11 @@ cp_default_config_file(NameVsn) ->
true ?= filelib:is_regular(Source), true ?= filelib:is_regular(Source),
%% destination path not existed (not configured) %% destination path not existed (not configured)
true ?= (not filelib:is_regular(Destination)), true ?= (not filelib:is_regular(Destination)),
ok = filelib:ensure_dir(Destination),
case file:copy(Source, Destination) of case file:copy(Source, Destination) of
{ok, _} -> {ok, _} ->
ok; ok,
ensure_config_map(NameVsn);
{error, Reason} -> {error, Reason} ->
?SLOG(warning, #{ ?SLOG(warning, #{
msg => "failed_to_copy_plugin_default_hocon_config", msg => "failed_to_copy_plugin_default_hocon_config",