commit d2f9fea: [Minor] Lua_redis: Report script registration position on errors

Vsevolod Stakhov vsevolod at highsecure.ru
Sun Jul 7 11:07:24 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-07-07 09:44:45 +0100
URL: https://github.com/rspamd/rspamd/commit/d2f9feaf547b6fd3e7dc2a541b8e6b11282ef671

[Minor] Lua_redis: Report script registration position on errors

---
 lualib/lua_redis.lua | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua
index ae5fa2299..656bd6baa 100644
--- a/lualib/lua_redis.lua
+++ b/lualib/lua_redis.lua
@@ -1101,8 +1101,8 @@ local function load_script_task(script, task)
     opt.task = task
     opt.callback = function(err, data)
       if err then
-        logger.errx(task, 'cannot upload script to %s: %s',
-          opt.upstream:get_addr(), err)
+        logger.errx(task, 'cannot upload script to %s: %s; registered from: %s:%s',
+          opt.upstream:get_addr(), err, script.caller.short_src, script.caller.currentline)
         opt.upstream:fail()
         script.fatal_error = err
       else
@@ -1143,8 +1143,8 @@ local function load_script_taskless(script, cfg, ev_base)
     opt.ev_base = ev_base
     opt.callback = function(err, data)
       if err then
-        logger.errx(cfg, 'cannot upload script to %s: %s',
-          opt.upstream:get_addr(), err)
+        logger.errx(cfg, 'cannot upload script to %s: %s; registered from: %s:%s',
+          opt.upstream:get_addr(), err, script.caller.short_src, script.caller.currentline)
         opt.upstream:fail()
         script.fatal_error = err
       else
@@ -1183,7 +1183,10 @@ local function load_redis_script(script, cfg, ev_base, _)
 end
 
 local function add_redis_script(script, redis_params)
+  local caller = debug.getinfo(2)
+
   local new_script = {
+    caller = caller,
     loaded = false,
     redis_params = redis_params,
     script = script,


More information about the Commits mailing list