mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-10-04 12:10:55 +02:00
commit 2b7c24b641
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -12,10 +12,10 @@ New features
- mod\_pep\_plus - mod\_pep\_plus
- Asynchronous operations - Asynchronous operations
0.10.not-released-yet 0.10.0
===================== =====================
**YYYY-MM-DD** **2017-10-02**
New features New features
------------ ------------

17
util/sql.lua
View file

@ -217,8 +217,9 @@ function engine:debug(enable)
end end
end end
local function handleerr(err) local function handleerr(err)
log("error", "Error in SQL transaction: %s", debug_traceback(err, 3)); local trace = debug_traceback(err, 3);
return err; log("debug", "Error in SQL transaction: %s", trace);
return { err = err, traceback = trace };
end end
function engine:_transaction(func, ...) function engine:_transaction(func, ...)
if not self.conn then if not self.conn then
@ -238,9 +239,9 @@ function engine:_transaction(func, ...)
if not ok then return ok, err; end -- commit failed if not ok then return ok, err; end -- commit failed
return success, a, b, c; return success, a, b, c;
else else
log("debug", "SQL transaction failure [%s]: %s", tostring(func), a); log("debug", "SQL transaction failure [%s]: %s", tostring(func), a.err);
if self.conn then self.conn:rollback(); end if self.conn then self.conn:rollback(); end
return success, a; return success, a.err;
end end
end end
function engine:transaction(...) function engine:transaction(...)
@ -248,8 +249,16 @@ function engine:transaction(...)
if not ok then if not ok then
local conn = self.conn; local conn = self.conn;
if not conn or not conn:ping() then if not conn or not conn:ping() then
log("debug", "Database connection was closed. Will reconnect and retry.");
self.conn = nil; self.conn = nil;
log("debug", "Retrying SQL transaction [%s]", tostring((...)));
ok, ret = self:_transaction(...); ok, ret = self:_transaction(...);
log("debug", "SQL transaction retry %s", ok and "succeeded" or "failed");
else
log("debug", "SQL connection is up, so not retrying");
end
if not ok then
log("error", "Error in SQL transaction: %s", ret);
end end
end end
return ok, ret; return ok, ret;