summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2016-05-01 22:06:15 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2016-05-01 22:06:15 +0200
commitb46ed7044a6d57670b2e7f5b6278254ecd869b78 (patch)
tree43d340584fb6f6658fe5f801ff8e7d701599f4e2 /src
parentejabberdctl: Fix path to epmd (diff)
Cope with modules that don't export mod_opt_type/1
Diffstat (limited to 'src')
-rw-r--r--src/gen_mod.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gen_mod.erl b/src/gen_mod.erl
index efbfc087..8a432b4f 100644
--- a/src/gen_mod.erl
+++ b/src/gen_mod.erl
@@ -301,7 +301,7 @@ validate_opts(Module, Opts) ->
db_type(Opts, Module) when is_list(Opts) ->
db_type(global, Opts, Module);
db_type(Host, Module) when is_atom(Module) ->
- case Module:mod_opt_type(db_type) of
+ case catch Module:mod_opt_type(db_type) of
F when is_function(F) ->
case get_module_opt(Host, Module, db_type, F) of
undefined -> ejabberd_config:default_db(Host, Module);
@@ -314,7 +314,7 @@ db_type(Host, Module) when is_atom(Module) ->
-spec db_type(binary(), opts(), module()) -> db_type().
db_type(Host, Opts, Module) ->
- case Module:mod_opt_type(db_type) of
+ case catch Module:mod_opt_type(db_type) of
F when is_function(F) ->
case get_opt(db_type, Opts, F) of
undefined -> ejabberd_config:default_db(Host, Module);