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

Fix transaction aborting and restarting in ejabberd_sql

Browse Source
This commit is contained in:
Alexey Shchepin 2019-03-07 22:14:13 +03:00
parent a4222fe9b3
commit e921b43754
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_sql.erl
View File

@ -524,6 +524,7 @@ outer_transaction(F, NRestarts, _Reason) ->
catch catch
?EX_RULE(throw, {aborted, Reason}, _) when NRestarts > 0 -> ?EX_RULE(throw, {aborted, Reason}, _) when NRestarts > 0 ->
sql_query_internal([<<"rollback;">>]), sql_query_internal([<<"rollback;">>]),
put(?NESTING_KEY, ?TOP_LEVEL_TXN),
outer_transaction(F, NRestarts - 1, Reason); outer_transaction(F, NRestarts - 1, Reason);
?EX_RULE(throw, {aborted, Reason}, Stack) when NRestarts =:= 0 -> ?EX_RULE(throw, {aborted, Reason}, Stack) when NRestarts =:= 0 ->
?ERROR_MSG("SQL transaction restarts exceeded~n** " ?ERROR_MSG("SQL transaction restarts exceeded~n** "
@ -610,6 +611,7 @@ sql_query_internal(#sql_query{} = Query) ->
check_error(Res, Query); check_error(Res, Query);
sql_query_internal(F) when is_function(F) -> sql_query_internal(F) when is_function(F) ->
case catch execute_fun(F) of case catch execute_fun(F) of
{aborted, Reason} -> {error, Reason};
{'EXIT', Reason} -> {error, Reason}; {'EXIT', Reason} -> {error, Reason};
Res -> Res Res -> Res
end; end;