diff options
| author | Kim Alvefur <zash@zash.se> | 2019-07-30 02:23:44 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-07-30 02:23:44 +0200 |
| commit | 358ade297948443295224b6400e06447636c0e32 (patch) | |
| tree | 89a9b9b526af76769da69e94bfe070464d55a3ff /util | |
| parent | 57b3a1dc873aa16a723e8ee90349ca3d94cc9f46 (diff) | |
| download | prosody-358ade297948443295224b6400e06447636c0e32.tar.gz prosody-358ade297948443295224b6400e06447636c0e32.zip | |
util.sql: Remove tostring call from logging
Taken care of by loggingmanager now
Diffstat (limited to 'util')
| -rw-r--r-- | util/sql.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/sql.lua b/util/sql.lua index 00c7b57f..4406d7ff 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -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 |