From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 29 Jul 2017 15:06:21 +0000 (+0100)
Subject: [Minor] Some fixes after rework
X-Git-Tag: 1.7.0~787
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b44510d2396fe86ffde9e55fad53154ba709a329;p=rspamd.git

[Minor] Some fixes after rework
---

diff --git a/src/plugins/lua/fann_redis.lua b/src/plugins/lua/fann_redis.lua
index a710ae264..ee73a5bf9 100644
--- a/src/plugins/lua/fann_redis.lua
+++ b/src/plugins/lua/fann_redis.lua
@@ -29,8 +29,6 @@ local fann_symbol_ham = 'FANNR_HAM'
 local rspamd_redis = require "lua_redis"
 local fun = require "fun"
 local meta_functions = require "meta_functions"
-
-local module_log_id = 0x200
 -- Module vars
 -- ANNs indexed by settings id
 local fanns = {
@@ -39,6 +37,8 @@ local fanns = {
   }
 }
 
+local opts = rspamd_config:get_all_opt("fann_redis")
+
 
 -- Lua script to train a row
 -- Uses the following keys:
@@ -457,8 +457,7 @@ local function fann_train_callback(task, score, required_score, id, opts)
         fun.each(function(e) table.insert(fann_data, e) end, mt)
         local str = rspamd_util.zstd_compress(table.concat(fann_data, ';'))
 
-        rspamd_redis.redis_make_request_taskless(ev_base,
-          rspamd_config,
+        rspamd_redis.redis_make_request(task,
           redis_params,
           nil,
           true, -- is write
@@ -846,8 +845,6 @@ local function ann_push_vector(task)
 end
 
 -- Initialization part
-
-local opts = rspamd_config:get_all_opt("fann_redis")
 if not (opts and type(opts) == 'table') or not redis_params then
   rspamd_logger.infox(rspamd_config, 'Module is unconfigured')
   return