From 2b21d9f35c69083c05ac5cfb2931c5aa0877b41f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Mar 2016 16:09:34 +0100 Subject: [PATCH] util.sql: Log errors in transaction to error level with traceback but return only error message (fixes #464) --- util/sql.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/sql.lua b/util/sql.lua index 657acb79..acdf9c63 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -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)); -- 2.30.2