mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-27 14:30:55 +02:00
Do not call transform_terms multiple times on configs when merging them
This commit is contained in:
parent
13ead140f4
commit
c55319c81e
@ -498,8 +498,8 @@ include_config_files(Terms) ->
|
|||||||
include_config_file(File, Opts)
|
include_config_file(File, Opts)
|
||||||
end, lists:flatten(FileOpts)),
|
end, lists:flatten(FileOpts)),
|
||||||
|
|
||||||
M1 = merge_configs(transform_terms(Terms1), #{}),
|
M1 = merge_configs(Terms1, #{}),
|
||||||
M2 = merge_configs(transform_terms(Terms2), M1),
|
M2 = merge_configs(Terms2, M1),
|
||||||
maps_to_lists(M2).
|
maps_to_lists(M2).
|
||||||
|
|
||||||
transform_include_option({include_config_file, File}) when is_list(File) ->
|
transform_include_option({include_config_file, File}) when is_list(File) ->
|
||||||
|
Loading…
Reference in New Issue
Block a user