yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 09:49:18 +02:00
Code Issues Releases Wiki Activity

Strip duplicates from module's options

Browse source
This commit is contained in:
Evgeniy Khramtsov 2018-03-07 17:46:16 +03:00
parent bc808ffcde
commit c3eeb8624b
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gen_mod.erl
View file

@ -555,7 +555,8 @@ validate_opts(Host, Module, Opts0) ->
undef -> undef ->
Opts; Opts;
Validators -> Validators ->
validate_opts(Host, Module, Opts, Required, Validators) Opts1 = validate_opts(Host, Module, Opts, Required, Validators),
remove_duplicated_opts(Opts1)
end} end}
catch _:{missing_required_option, Opt} -> catch _:{missing_required_option, Opt} ->
ErrTxt = io_lib:format("Module '~s' is missing required option '~s'", ErrTxt = io_lib:format("Module '~s' is missing required option '~s'",
@ -680,6 +681,16 @@ merge_opts(Opts, DefaultOpts) ->
end end
end, Result, Opts). end, Result, Opts).
remove_duplicated_opts([{Opt, Val}, {Opt, _Default}|Opts]) ->
[{Opt, Val}|remove_duplicated_opts(Opts)];
remove_duplicated_opts([{Opt, [{SubOpt, _}|_] = SubOpts}|Opts])
when is_atom(SubOpt) ->
[{Opt, remove_duplicated_opts(SubOpts)}|remove_duplicated_opts(Opts)];
remove_duplicated_opts([OptVal|Opts]) ->
[OptVal|remove_duplicated_opts(Opts)];
remove_duplicated_opts([]) ->
[].
-spec get_submodules(binary(), module(), opts()) -> [module()]. -spec get_submodules(binary(), module(), opts()) -> [module()].
get_submodules(Host, Module, Opts) -> get_submodules(Host, Module, Opts) ->
try Module:mod_options(Host) of try Module:mod_options(Host) of