Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

Set 'sql_pool_size' to 1 by default for sqlite

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2016-11-21 21:34:56 +03:00
parent 3908a80ac9
commit 3189bb3bb9
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ejabberd_sql_sup.erl
View File

@ -61,10 +61,6 @@ start_link(Host) ->
?MODULE, [Host]). ?MODULE, [Host]).
init([Host]) -> init([Host]) ->
PoolSize = ejabberd_config:get_option(
{sql_pool_size, Host},
fun(I) when is_integer(I), I>0 -> I end,
?DEFAULT_POOL_SIZE),
StartInterval = ejabberd_config:get_option( StartInterval = ejabberd_config:get_option(
{sql_start_interval, Host}, {sql_start_interval, Host},
fun(I) when is_integer(I), I>0 -> I end, fun(I) when is_integer(I), I>0 -> I end,
@ -76,6 +72,7 @@ init([Host]) ->
(mssql) -> mssql; (mssql) -> mssql;
(odbc) -> odbc (odbc) -> odbc
end, odbc), end, odbc),
PoolSize = get_pool_size(Type, Host),
case Type of case Type of
sqlite -> sqlite ->
check_sqlite_db(Host); check_sqlite_db(Host);
@ -117,6 +114,23 @@ remove_pid(Host, Pid) ->
end, end,
mnesia:ets(F). mnesia:ets(F).
-spec get_pool_size(atom(), binary()) -> pos_integer().
get_pool_size(SQLType, Host) ->
PoolSize = ejabberd_config:get_option(
{sql_pool_size, Host},
fun(I) when is_integer(I), I>0 -> I end,
case SQLType of
sqlite -> 1;
_ -> ?DEFAULT_POOL_SIZE
end),
if PoolSize > 1 andalso SQLType == sqlite ->
?WARNING_MSG("it's not recommended to set sql_pool_size > 1 for "
"sqlite, because it may cause race conditions", []);
true ->
ok
end,
PoolSize.
transform_options(Opts) -> transform_options(Opts) ->
lists:foldl(fun transform_options/2, [], Opts). lists:foldl(fun transform_options/2, [], Opts).