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

fix: retry not_found if conf file not exist

This commit is contained in:
zhongwencool 2024-07-09 10:33:09 +08:00
parent 1ad02a11e2
commit 083537daa3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx_conf/src/emqx_conf_cli.erl
View File

@ -312,8 +312,14 @@ get_config(Key) ->
load_config(Path, Opts) when is_list(Path) -> load_config(Path, Opts) when is_list(Path) ->
case hocon:files([Path]) of case hocon:files([Path]) of
{ok, RawConf} when RawConf =:= #{} -> {ok, RawConf} when RawConf =:= #{} ->
emqx_ctl:warning("load ~ts is empty~n", [Path]), case filelib:is_file(Path) of
{error, empty_hocon_file}; true ->
emqx_ctl:warning("load ~ts is empty~n", [Path]),
{error, empty_hocon_file};
false ->
emqx_ctl:warning("~ts is not found~n", [Path]),
{error, not_found_hocon_file}
end;
{ok, RawConf} -> {ok, RawConf} ->
load_config_from_raw(RawConf, Opts); load_config_from_raw(RawConf, Opts);
{error, Reason} -> {error, Reason} ->

6
apps/emqx_conf/test/emqx_conf_cli_SUITE.erl
View File

@ -81,7 +81,11 @@ t_load_config(Config) ->
Conf#{<<"sources">> => [emqx_authz_schema:default_authz()]}, Conf#{<<"sources">> => [emqx_authz_schema:default_authz()]},
emqx_conf:get_raw([Authz]) emqx_conf:get_raw([Authz])
), ),
?assertEqual({error, empty_hocon_file}, emqx_conf_cli:conf(["load", "non-exist-file"])), ?assertEqual({error, not_found_hocon_file}, emqx_conf_cli:conf(["load", "non-exist-file"])),
EmptyFile = "empty_file.conf",
ok = file:write_file(EmptyFile, <<>>),
?assertEqual({error, empty_hocon_file}, emqx_conf_cli:conf(["load", EmptyFile])),
ok = file:delete(EmptyFile),
ok. ok.
t_conflict_mix_conf(Config) -> t_conflict_mix_conf(Config) ->