diff options
Diffstat (limited to 'src/ejabberd_config.erl')
| -rw-r--r-- | src/ejabberd_config.erl | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 9f372fdbb..e78ca3fea 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -182,7 +182,6 @@ process_host_term(Term, Host, State) -> {hosts, _Hosts} -> State; {odbc_server, ODBC_server} -> - odbc_modules_found = check_odbc_modules(ODBC_server), add_option({odbc_server, Host}, ODBC_server, State); {Opt, Val} -> add_option({Opt, Host}, Val, State) @@ -309,33 +308,3 @@ get_vh_by_auth_method(AuthMethod) -> mnesia:dirty_select(local_config, [{#local_config{key = {auth_method, '$1'}, value=AuthMethod},[],['$1']}]). - -check_odbc_modules(ODBC_server) -> - case catch check_odbc_modules2(ODBC_server) of - {'EXIT', {undef, [{Module, module_info, []} | _]}} -> - ?CRITICAL_MSG("ejabberd is configured to use ODBC, but the Erlang module '~p' is not installed.", [Module]), - odbc_module_not_found; - _ -> odbc_modules_found - end. - -check_odbc_modules2(ODBC_server) -> - check_modules_exists([ejabberd_odbc, ejabberd_odbc_sup, odbc_queries]), - case ODBC_server of - {mysql, _Server, _DB, _Username, _Password} -> - check_modules_exists([mysql, mysql_auth, mysql_conn, mysql_recv]); - - {mysql, _Server, _Port, _DB, _Username, _Password} -> - check_modules_exists([mysql, mysql_auth, mysql_conn, mysql_recv]); - - {pgsql, _Server, _DB, _Username, _Password} -> - check_modules_exists([pgsql, pgsql_proto, pgsql_tcp, pgsql_util]); - - {pgsql, _Server, _Port, _DB, _Username, _Password} -> - check_modules_exists([pgsql, pgsql_proto, pgsql_tcp, pgsql_util]); - - Server when is_list(Server) -> - ok - end. - -check_modules_exists(Modules) -> - [true = is_list(Module:module_info()) || Module <- Modules]. |