From b82b93f8f0c229e94a89469b0754bab0e28cd17c Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Sat, 29 Apr 2017 11:39:40 +0300 Subject: Don't validate an option in ejabberd_config:get_option() functions The commit introduces the following changes: * Now there is no need to pass validating function in ejabberd_config:get_option() functions, because the configuration keeps already validated values. * New function ejabberd_config:get_option/1 is introduced * Function ejabberd_config:get_option/3 is deprecated. If the function is still called, the second argument (validating function) is simply ignored. * The second argument for ejabberd_config:get_option/2 is now a default value, not a validating function. --- src/sql_queries.erl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/sql_queries.erl') diff --git a/src/sql_queries.erl b/src/sql_queries.erl index 813f5d695..5d5729102 100644 --- a/src/sql_queries.erl +++ b/src/sql_queries.erl @@ -246,9 +246,7 @@ users_number(LServer) -> fun(pgsql, _) -> case ejabberd_config:get_option( - {pgsql_users_number_estimate, LServer}, - fun(V) when is_boolean(V) -> V end, - false) of + {pgsql_users_number_estimate, LServer}, false) of true -> ejabberd_sql:sql_query_t( ?SQL("select @(reltuples :: bigint)d from pg_class" -- cgit v1.2.3