From: Andrew Lewis Date: Tue, 27 Feb 2018 14:35:29 +0000 (+0200) Subject: [Minor] Rename variables for clarity X-Git-Tag: 1.7.0~110^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c73aa73b762fae3b11da14a9432db137e5e55db7;p=rspamd.git [Minor] Rename variables for clarity --- diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua index aab0fc8f1..ceb997c33 100644 --- a/lualib/lua_redis.lua +++ b/lualib/lua_redis.lua @@ -843,8 +843,8 @@ local function add_redis_script(script, redis_params) end exports.add_redis_script = add_redis_script -local function exec_redis_script(id, params, callback, args, aargs) - local args_modified = false +local function exec_redis_script(id, params, callback, keys, args) + local keys_modified = false if not redis_scripts[id] then logger.errx("cannot find registered script with id %s", id) @@ -878,26 +878,26 @@ local function exec_redis_script(id, params, callback, args, aargs) end end - if not args_modified then - table.insert(args, 1, tostring(#args)) - table.insert(args, 1, script.sha) - if type(aargs) == 'table' then - for _, a in ipairs(aargs) do - table.insert(args, a) + if not keys_modified then + table.insert(keys, 1, tostring(#keys)) + table.insert(keys, 1, script.sha) + if type(args) == 'table' then + for _, a in ipairs(args) do + table.insert(keys, a) end end - args_modified = true + keys_modified = true end if params.task then if not rspamd_redis_make_request(params.task, script.redis_params, - params.key, params.is_write, redis_cb, 'EVALSHA', args) then + params.key, params.is_write, redis_cb, 'EVALSHA', keys) then callback('Cannot make redis request', nil) end else if not redis_make_request_taskless(params.ev_base, rspamd_config, script.redis_params, - params.key, params.is_write, redis_cb, 'EVALSHA', args) then + params.key, params.is_write, redis_cb, 'EVALSHA', keys) then callback('Cannot make redis request', nil) end end