diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-05-04 14:19:52 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-05-04 14:19:52 +1000 |
| commit | 75d3152a0f87c9c706ba306cb3b8725cfd81818e (patch) | |
| tree | 5f4d6f03d1abc79c94e07c7e486e0efb101dfc3e /src/gen_mod.erl | |
| parent | Remove CRLFs introduced in the previous merge (diff) | |
| parent | Repeated http-bind request should abort only requests with same rid (diff) | |
Merge branch '2.1.x' into 2.2.x
Conflicts:
src/mod_muc/mod_muc.erl
src/mod_muc/mod_muc_room.erl
src/mod_offline.erl
src/mod_offline_odbc.erl
src/mod_shared_roster.erl
src/web/ejabberd_http_bind.erl
Diffstat (limited to 'src/gen_mod.erl')
| -rw-r--r-- | src/gen_mod.erl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gen_mod.erl b/src/gen_mod.erl index 941717f64..4f5c06e7a 100644 --- a/src/gen_mod.erl +++ b/src/gen_mod.erl @@ -34,6 +34,8 @@ get_opt/2, get_opt/3, get_opt_host/3, + db_type/1, + db_type/2, get_module_opt/4, get_module_opt_host/3, loaded_modules/1, @@ -192,6 +194,18 @@ get_opt_host(Host, Opts, Default) -> Val = get_opt(host, Opts, Default), ejabberd_regexp:greplace(Val, "@HOST@", Host). +db_type(Opts) -> + case get_opt(db_type, Opts, mnesia) of + odbc -> odbc; + _ -> mnesia + end. + +db_type(Host, Module) -> + case get_module_opt(Host, Module, db_type, mnesia) of + odbc -> odbc; + _ -> mnesia + end. + loaded_modules(Host) -> ets:select(ejabberd_modules, [{#ejabberd_module{_ = '_', module_host = {'$1', Host}}, |