Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Use ejabberd_sql:abort/1 instead of exit/1

This commit is contained in:
Evgeniy Khramtsov 2017-03-31 19:10:07 +03:00
parent 178a0a3e1b
commit 5087e9c2df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod_proxy65_sql.erl
View File

@ -105,16 +105,16 @@ activate_stream(SID, IJID, MaxConnections, _Node) ->
?SQL("select @(count(*))d from proxy65 " ?SQL("select @(count(*))d from proxy65 "
"where jid_i=%(IJID)s")) of "where jid_i=%(IJID)s")) of
{selected, [{Num}]} when Num > MaxConnections -> {selected, [{Num}]} when Num > MaxConnections ->
exit({limit, IPid, TPid}); ejabberd_sql:abort({limit, IPid, TPid});
{selected, _} -> {selected, _} ->
{ok, IPid, TPid}; {ok, IPid, TPid};
Err -> Err ->
exit(Err) ejabberd_sql:abort(Err)
end; end;
{updated, _} -> {updated, _} ->
{ok, IPid, TPid}; {ok, IPid, TPid};
Err -> Err ->
exit(Err) ejabberd_sql:abort(Err)
end end
catch _:{bad_node, _} -> catch _:{bad_node, _} ->
{error, notfound} {error, notfound}
@ -124,7 +124,7 @@ activate_stream(SID, IJID, MaxConnections, _Node) ->
{selected, _} -> {selected, _} ->
{error, notfound}; {error, notfound};
Err -> Err ->
exit(Err) ejabberd_sql:abort(Err)
end end
end, end,
case ejabberd_sql:sql_transaction(?MYNAME, F) of case ejabberd_sql:sql_transaction(?MYNAME, F) of