From d2e088ead2cad3fdcdd974ca722d294cbaf1bb80 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Wed, 24 May 2017 10:16:49 +0100 Subject: [PATCH] [Minor] Fix plugins after global reworks --- src/plugins/lua/dmarc.lua | 14 +++++----- src/plugins/lua/fann_redis.lua | 48 +++++++++++++++++----------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua index 93775249b..9b4e7f149 100644 --- a/src/plugins/lua/dmarc.lua +++ b/src/plugins/lua/dmarc.lua @@ -22,7 +22,7 @@ local mempool = require "rspamd_mempool" local rspamd_tcp = require "rspamd_tcp" local rspamd_url = require "rspamd_url" local rspamd_util = require "rspamd_util" -local globals = require "global_functions" +local rspamd_redis = require "lua_redis" local check_local = false local check_authed = false @@ -162,7 +162,7 @@ local function load_scripts(cfg, ev_base) rspamd_logger.infox(cfg, 'Loaded DMARC report script with SHA %s', take_report_sha) end end - local ret = globals.redis_make_request_taskless(ev_base, + local ret = rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -532,7 +532,7 @@ local function dmarc_callback(task) local idx_key = table.concat({redis_keys.index_prefix, period}, redis_keys.join_char) if report_data then - local ret = globals.redis_make_request(task, + local ret = rspamd_redis.redis_make_request(task, redis_params, -- connect params hfromdom, -- hash key true, -- is write @@ -874,7 +874,7 @@ if opts['reporting'] == true then dmarc_xml('push', {data[2][i], data[2][i+1]}) end if cursor ~= 0 then - local ret = globals.redis_make_request_taskless(ev_base, + local ret = rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -892,7 +892,7 @@ if opts['reporting'] == true then end end end - local ret = globals.redis_make_request_taskless(ev_base, + local ret = rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -915,7 +915,7 @@ if opts['reporting'] == true then rspamd_logger.infox(rspamd_config, 'Deleted reports for %s', reporting_domain) get_reporting_domain() end - local ret = globals.redis_make_request_taskless(ev_base, + local ret = rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -1082,7 +1082,7 @@ if opts['reporting'] == true then end end local idx_key = table.concat({redis_keys.index_prefix, want_period}, redis_keys.join_char) - local ret = globals.redis_make_request_taskless(ev_base, + local ret = rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, diff --git a/src/plugins/lua/fann_redis.lua b/src/plugins/lua/fann_redis.lua index 78d945466..2c3de9ddc 100644 --- a/src/plugins/lua/fann_redis.lua +++ b/src/plugins/lua/fann_redis.lua @@ -26,7 +26,7 @@ local rspamd_fann = require "rspamd_fann" local rspamd_util = require "rspamd_util" local fann_symbol_spam = 'FANNR_SPAM' local fann_symbol_ham = 'FANNR_HAM' -local globals = require "global_functions" +local rspamd_redis = require "lua_redis" local fun = require "fun" local module_log_id = 0x200 @@ -183,7 +183,7 @@ local function load_scripts(cfg, ev_base, on_load_cb) redis_can_train_sha = tostring(data) end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -207,7 +207,7 @@ local function load_scripts(cfg, ev_base, on_load_cb) end end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -224,7 +224,7 @@ local function load_scripts(cfg, ev_base, on_load_cb) redis_maybe_invalidate_sha = tostring(data) end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -241,7 +241,7 @@ local function load_scripts(cfg, ev_base, on_load_cb) redis_locked_invalidate_sha = tostring(data) end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -258,7 +258,7 @@ local function load_scripts(cfg, ev_base, on_load_cb) redis_maybe_lock_sha = tostring(data) end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -275,7 +275,7 @@ local function load_scripts(cfg, ev_base, on_load_cb) redis_save_unlock_sha = tostring(data) end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -433,7 +433,7 @@ local function load_or_invalidate_fann(data, id, ev_base) end -- Invalidate ANN rspamd_logger.infox(rspamd_config, 'invalidate ANN %s', prefix) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -481,7 +481,7 @@ local function fann_train_callback(score, required_score, results, _, id, opts, fun.each(function(e) table.insert(learn_data, e) end, extra) local str = rspamd_util.zstd_compress(table.concat(learn_data, ';')) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -500,7 +500,7 @@ local function fann_train_callback(score, required_score, results, _, id, opts, end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -529,7 +529,7 @@ local function train_fann(_, ev_base, elt) if err then rspamd_logger.errx(rspamd_config, 'cannot save ANN %s to redis: %s', prefix, err) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -549,7 +549,7 @@ local function train_fann(_, ev_base, elt) if errcode ~= 0 then rspamd_logger.errx(rspamd_config, 'cannot train ANN %s: %s', prefix, errmsg) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -565,7 +565,7 @@ local function train_fann(_, ev_base, elt) fanns[elt].version = fanns[elt].version + 1 fanns[elt].fann = fanns[elt].fann_train fanns[elt].fann_train = nil - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -581,7 +581,7 @@ local function train_fann(_, ev_base, elt) if err or type(data) ~= 'table' then rspamd_logger.errx(rspamd_config, 'cannot get ham tokens for ANN %s from redis: %s', prefix, err) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -632,7 +632,7 @@ local function train_fann(_, ev_base, elt) end -- Invalidate ANN rspamd_logger.infox(rspamd_config, 'invalidate ANN %s: training data is invalid', prefix) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -654,7 +654,7 @@ local function train_fann(_, ev_base, elt) if err or type(data) ~= 'table' then rspamd_logger.errx(rspamd_config, 'cannot get spam tokens for ANN %s from redis: %s', prefix, err) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -669,7 +669,7 @@ local function train_fann(_, ev_base, elt) local _,str = rspamd_util.zstd_decompress(tok) return fun.totable(fun.map(tonumber, rspamd_str_split(tostring(str), ';'))) end, data)) - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -690,7 +690,7 @@ local function train_fann(_, ev_base, elt) end elseif type(data) == 'number' then -- Can train ANN - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -712,7 +712,7 @@ local function train_fann(_, ev_base, elt) end end if learning_spawned then - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -737,7 +737,7 @@ local function train_fann(_, ev_base, elt) rspamd_logger.infox(rspamd_config, 'do not learn ANN %s, already learning another ANN', prefix) return end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -769,7 +769,7 @@ local function maybe_train_fanns(cfg, ev_base) end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -788,7 +788,7 @@ local function maybe_train_fanns(cfg, ev_base) return 1.0 end -- First we need to get all fanns stored in our Redis - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -825,7 +825,7 @@ local function check_fanns(_, ev_base) local_ver = fanns[elt].version end end - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, @@ -844,7 +844,7 @@ local function check_fanns(_, ev_base) return 1.0 end -- First we need to get all fanns stored in our Redis - globals.redis_make_request_taskless(ev_base, + rspamd_redis.redis_make_request_taskless(ev_base, rspamd_config, redis_params, nil, -- 2.39.5