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

util.sql: Log errors in transaction to error level with traceback but return only error message (fixes #464)

Browse source
This commit is contained in:
Kim Alvefur 2016-03-25 16:09:34 +01:00
parent 41522cb84a
commit c24be27b2f
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/sql.lua
View file

@ -202,6 +202,10 @@ function engine:debug(enable)
engine.update = engine.execute_update;
end
end
local function handleerr(err)
log("error", "Error in SQL transaction: %s", debug_traceback(err, 3));
return err;
end
function engine:_transaction(func, ...)
if not self.conn then
local ok, err = self:connect();
@ -212,7 +216,7 @@ function engine:_transaction(func, ...)
local function f() return func(unpack(args, 1, n_args)); end
log("debug", "SQL transaction begin [%s]", tostring(func));
self.__transaction = true;
local success, a, b, c = xpcall(f, debug_traceback);
local success, a, b, c = xpcall(f, handleerr);
self.__transaction = nil;
if success then
log("debug", "SQL transaction success [%s]", tostring(func));