diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-29 11:48:57 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-29 11:48:57 +0300 |
| commit | 2b63d07329b2af63d63b14d237e63565f78e8018 (patch) | |
| tree | 3a4b245b5d50cb4f54a6777d20e138efed105835 /src/gen_mod.erl | |
| parent | Fix elixir tests (diff) | |
| parent | Don't validate an option in ejabberd_config:get_option() functions (diff) | |
Merge branch 'new-option-validation'
Diffstat (limited to 'src/gen_mod.erl')
| -rw-r--r-- | src/gen_mod.erl | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/gen_mod.erl b/src/gen_mod.erl index 4b845a386..c39b5153c 100644 --- a/src/gen_mod.erl +++ b/src/gen_mod.erl @@ -119,14 +119,7 @@ start_modules() -> end, ?MYHOSTS). get_modules_options(Host) -> - ejabberd_config:get_option( - {modules, Host}, - fun(Mods) -> - lists:map( - fun({M, A}) when is_atom(M), is_list(A) -> - {M, A} - end, Mods) - end, []). + ejabberd_config:get_option({modules, Host}, []). sort_modules(Host, ModOpts) -> G = digraph:new([acyclic]), @@ -211,8 +204,7 @@ start_module(Host, Module, Opts0) -> -spec reload_modules(binary()) -> ok. reload_modules(Host) -> - NewMods = ejabberd_config:get_option( - {modules, Host}, opt_type(modules), []), + NewMods = ejabberd_config:get_option({modules, Host}, []), OldMods = ets:select( ejabberd_modules, ets:fun2ms( @@ -369,7 +361,7 @@ get_opt(Opt, Opts, F) -> get_opt({Opt, Host}, Opts, F, Default) -> case lists:keysearch(Opt, 1, Opts) of false -> - ejabberd_config:get_option({Opt, Host}, F, Default); + ejabberd_config:get_option({Opt, Host}, Default); {value, {_, Val}} -> ejabberd_config:prepare_opt_val(Opt, Val, F, Default) end; |