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

fix(conf): can't include local/overide-conf file

This commit is contained in:
zhongwencool 2021-12-24 19:20:36 +08:00
parent 6326e436d3
commit 0b099432c5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx/src/emqx_config.erl
View File

@ -264,6 +264,7 @@ init_load(SchemaMod, Conf) when is_list(Conf) orelse is_binary(Conf) ->
{error, Reason} ->
?SLOG(error, #{msg => failed_to_load_hocon_conf,
reason => Reason,
pwd => file:get_cwd(),
include_dirs => IncDir
}),
error(failed_to_load_hocon_conf)
@ -280,7 +281,7 @@ init_load(SchemaMod, RawConf) when is_map(RawConf) ->
maps:with(RootNames, RawConfWithEnvs)).
include_dirs() ->
[filename:join(emqx:data_dir(), "configs")].
[filename:join(emqx:data_dir(), "configs") ++ "/"].
merge_envs(SchemaMod, RawConf) ->
Opts = #{logger => fun(_, _) -> ok end, %% everything should have been logged already when check_config