diff options
Diffstat (limited to 'src/ejabberd_sm.erl')
| -rw-r--r-- | src/ejabberd_sm.erl | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 20614a58d..ce2abfff0 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -865,14 +865,9 @@ force_update_presence({LUser, LServer}) -> -spec get_sm_backend(binary()) -> module(). get_sm_backend(Host) -> - DBType = case ejabberd_config:get_option( + DBType = ejabberd_config:get_option( {sm_db_type, Host}, - fun(T) -> ejabberd_config:v_db(?MODULE, T) end) of - undefined -> - ejabberd_config:default_ram_db(Host, ?MODULE); - T -> - T - end, + ejabberd_config:default_ram_db(Host, ?MODULE)), list_to_atom("ejabberd_sm_" ++ atom_to_list(DBType)). -spec get_sm_backends() -> [module()]. @@ -904,15 +899,12 @@ init_cache() -> cache_opts() -> MaxSize = ejabberd_config:get_option( sm_cache_size, - opt_type(sm_cache_size), ejabberd_config:cache_size(global)), CacheMissed = ejabberd_config:get_option( sm_cache_missed, - opt_type(sm_cache_missed), ejabberd_config:cache_missed(global)), LifeTime = case ejabberd_config:get_option( sm_cache_life_time, - opt_type(sm_cache_life_time), ejabberd_config:cache_life_time(global)) of infinity -> infinity; I -> timer:seconds(I) @@ -943,7 +935,6 @@ use_cache(Mod, LServer) -> false -> ejabberd_config:get_option( {sm_use_cache, LServer}, - ejabberd_sm:opt_type(sm_use_cache), ejabberd_config:use_cache(LServer)) end. |