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

fix: don't add default if root_key not found

This commit is contained in:
Zhongwen Deng 2022-05-23 14:08:14 +08:00
parent 8aa60cc0a5
commit 96baf4ccdb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,14 +334,18 @@ raw_conf_with_default(SchemaMod, RootNames, RawConf) ->
true -> true ->
Acc; Acc;
false -> false ->
{_, {_, Schema}} = lists:keyfind(Name, 1, hocon_schema:roots(SchemaMod)), case lists:keyfind(Name, 1, hocon_schema:roots(SchemaMod)) of
Default = false ->
case hocon_schema:field_schema(Schema, type) of Acc;
?ARRAY(_) -> []; {_, {_, Schema}} ->
?LAZY(?ARRAY(_)) -> []; Default =
_ -> #{} case hocon_schema:field_schema(Schema, type) of
end, ?ARRAY(_) -> [];
Acc#{Name => Default} ?LAZY(?ARRAY(_)) -> [];
_ -> #{}
end,
Acc#{Name => Default}
end
end end
end, end,
RawDefault = lists:foldl(Fun, #{}, RootNames), RawDefault = lists:foldl(Fun, #{}, RootNames),