aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-03-31 19:10:07 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-03-31 19:10:07 +0300
commit5087e9c2df98c68ca75e2244445cecb8392b7149 (patch)
tree472807a33bbec48d3d8d3b4744325bb14ea9f445
parentMerge branch 'master' of github.com:processone/ejabberd (diff)
Use ejabberd_sql:abort/1 instead of exit/1
-rw-r--r--src/mod_proxy65_sql.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_proxy65_sql.erl b/src/mod_proxy65_sql.erl
index 5007bd090..ae6cea208 100644
--- a/src/mod_proxy65_sql.erl
+++ b/src/mod_proxy65_sql.erl
@@ -105,16 +105,16 @@ activate_stream(SID, IJID, MaxConnections, _Node) ->
?SQL("select @(count(*))d from proxy65 "
"where jid_i=%(IJID)s")) of
{selected, [{Num}]} when Num > MaxConnections ->
- exit({limit, IPid, TPid});
+ ejabberd_sql:abort({limit, IPid, TPid});
{selected, _} ->
{ok, IPid, TPid};
Err ->
- exit(Err)
+ ejabberd_sql:abort(Err)
end;
{updated, _} ->
{ok, IPid, TPid};
Err ->
- exit(Err)
+ ejabberd_sql:abort(Err)
end
catch _:{bad_node, _} ->
{error, notfound}
@@ -124,7 +124,7 @@ activate_stream(SID, IJID, MaxConnections, _Node) ->
{selected, _} ->
{error, notfound};
Err ->
- exit(Err)
+ ejabberd_sql:abort(Err)
end
end,
case ejabberd_sql:sql_transaction(?MYNAME, F) of