25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Avoid code duplication in gen_mod

This commit is contained in:
Evgeny Khramtsov 2019-06-23 17:06:53 +03:00
parent deee194522
commit 4b65fcab62

View File

@ -30,7 +30,7 @@
stop_child/1, stop_child/2, config_reloaded/0]). stop_child/1, stop_child/2, config_reloaded/0]).
-export([start_module/2, stop_module/2, stop_module_keep_config/2, -export([start_module/2, stop_module/2, stop_module_keep_config/2,
get_opt/2, set_opt/3, get_opt_hosts/1, is_equal_opt/3, get_opt/2, set_opt/3, get_opt_hosts/1, is_equal_opt/3,
get_module_opt/3, get_module_opt_hosts/2, get_module_opt/3, get_module_opts/2, get_module_opt_hosts/2,
loaded_modules/1, loaded_modules_with_opts/1, loaded_modules/1, loaded_modules_with_opts/1,
get_hosts/2, get_module_proc/2, is_loaded/2, is_loaded_elsewhere/2, get_hosts/2, get_module_proc/2, is_loaded/2, is_loaded_elsewhere/2,
start_modules/0, start_modules/1, stop_modules/0, stop_modules/1, start_modules/0, start_modules/1, stop_modules/0, stop_modules/1,
@ -324,19 +324,13 @@ set_opt(Opt, Val, Opts) ->
get_module_opt(global, Module, Opt) -> get_module_opt(global, Module, Opt) ->
get_module_opt(ejabberd_config:get_myname(), Module, Opt); get_module_opt(ejabberd_config:get_myname(), Module, Opt);
get_module_opt(Host, Module, Opt) -> get_module_opt(Host, Module, Opt) ->
try ets:lookup_element(ejabberd_modules, {Module, Host}, 3) of Opts = get_module_opts(Host, Module),
Opts -> get_opt(Opt, Opts) get_opt(Opt, Opts).
catch _:badarg ->
erlang:error({module_not_loaded, Module, Host})
end.
-spec get_module_opt_hosts(binary(), module()) -> [binary()]. -spec get_module_opt_hosts(binary(), module()) -> [binary()].
get_module_opt_hosts(Host, Module) -> get_module_opt_hosts(Host, Module) ->
try ets:lookup_element(ejabberd_modules, {Module, Host}, 3) of Opts = get_module_opts(Host, Module),
Opts -> get_opt_hosts(Opts) get_opt_hosts(Opts).
catch _:badarg ->
erlang:error({module_not_loaded, Module, Host})
end.
-spec get_opt_hosts(opts()) -> [binary()]. -spec get_opt_hosts(opts()) -> [binary()].
get_opt_hosts(Opts) -> get_opt_hosts(Opts) ->
@ -347,6 +341,12 @@ get_opt_hosts(Opts) ->
L L
end. end.
-spec get_module_opts(binary(), module()) -> opts().
get_module_opts(Host, Module) ->
try ets:lookup_element(ejabberd_modules, {Module, Host}, 3)
catch _:badarg -> erlang:error({module_not_loaded, Module, Host})
end.
-spec db_mod(binary() | global | db_type() | opts(), module()) -> module(). -spec db_mod(binary() | global | db_type() | opts(), module()) -> module().
db_mod(T, M) -> db_mod(T, M) ->
db_mod(db_type, T, M). db_mod(db_type, T, M).