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: Remove tostring call from logging

Browse source 
Taken care of by loggingmanager now
This commit is contained in:
Kim Alvefur 2019-07-30 02:23:44 +02:00
parent 57b3a1dc87
commit 358ade2979
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/sql.lua
View file

@ -201,18 +201,18 @@ function engine:_transaction(func, ...)
if not ok then return ok, err; end
end
--assert(not self.__transaction, "Recursive transactions not allowed");
log("debug", "SQL transaction begin [%s]", tostring(func));
log("debug", "SQL transaction begin [%s]", func);
self.__transaction = true;
local success, a, b, c = xpcall(func, handleerr, ...);
self.__transaction = nil;
if success then
log("debug", "SQL transaction success [%s]", tostring(func));
log("debug", "SQL transaction success [%s]", func);
local ok, err = self.conn:commit();
-- LuaDBI doesn't actually return an error message here, just a boolean
if not ok then return ok, err or "commit failed"; end
return success, a, b, c;
else
log("debug", "SQL transaction failure [%s]: %s", tostring(func), a.err);
log("debug", "SQL transaction failure [%s]: %s", func, a.err);
if self.conn then self.conn:rollback(); end
return success, a.err;
end
@ -224,7 +224,7 @@ function engine:transaction(...)
if not conn or not conn:ping() then
log("debug", "Database connection was closed. Will reconnect and retry.");
self.conn = nil;
log("debug", "Retrying SQL transaction [%s]", tostring((...)));
log("debug", "Retrying SQL transaction [%s]", (...));
ok, ret = self:_transaction(...);
log("debug", "SQL transaction retry %s", ok and "succeeded" or "failed");
else