Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00
Code Releases Activity

Let it crash on unspecified option

Browse Source
This commit is contained in:
Evgeny Khramtsov 2019-06-23 16:54:01 +03:00
parent abbf8dad6b
commit deee194522
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ejabberd_config.erl
View File

@ -138,27 +138,21 @@ dump(Y, Output) ->
end
end.
-spec get_option(option()) -> term().
get_option(Opt) ->
get_option(Opt, undefined).
-spec get_option(option(), term()) -> term().
get_option(Opt, Default) when is_atom(Opt) ->
get_option({Opt, global}, Default);
get_option(Opt, Default) ->
try get_option(Opt)
catch _:badarg -> Default
end.
-spec get_option(option()) -> term().
get_option(Opt) when is_atom(Opt) ->
get_option({Opt, global});
get_option(Opt) ->
Tab = case get_tmp_config() of
undefined -> ejabberd_options;
T -> T
end,
try ets:lookup_element(Tab, Opt, 2)
catch ?EX_RULE(Class, badarg, St) ->
Stack = ?EX_STACK(St),
?WARNING_MSG("Attempt to read unspecified option:~n"
"** Option: ~p~n"
"** ~s",
[Opt, misc:format_exception(2, Class, badarg, Stack)]),
Default
end.
ets:lookup_element(Tab, Opt, 2).
-spec set_option(option(), term()) -> ok.
set_option(Opt, Val) when is_atom(Opt) ->