[Minor] Fix upstreams handling

diff --git a/src/plugins/lua/asn.lua b/src/plugins/lua/asn.lua
index 91b5cc87499b27ee335c85c48cb514798feb17c7..d7afa250760bdb3b1f0b31dd70685f7ac15a9620 100644 (file)
--- a/src/plugins/lua/asn.lua
+++ b/src/plugins/lua/asn.lua
@@ -71,7 +71,7 @@ local function asn_check(task)
           if not redis_err then
             upstream:ok()
           else
-            rspamd_logger.infox(task, 'got error %s when setting asn record on server %s',
+            rspamd_logger.errx(task, 'got error %s when setting asn record on server %s',
               redis_err, upstream:get_addr())
             upstream:fail()
           end
@@ -89,8 +89,7 @@ local function asn_check(task)
             redis_key, tostring(options['expire'])
           })
         else
-          rspamd_logger.infox(task, 'got error while connecting to redis: %1', upstream:get_addr())
-          upstream:fail()
+          rspamd_logger.err(task, 'got error while connecting to redis')
         end
       end
     end
@@ -126,7 +125,7 @@ local function asn_check(task)
           {key, tostring(options.expire)} -- arguments
         )
         if not ret then
-          upstream:fail()
+          rspamd_logger.err('got error connecting to redis')
         end
       end
     end

diff --git a/src/plugins/lua/fann_classifier.lua b/src/plugins/lua/fann_classifier.lua
index ca6fb202688585f8b1fa2b06032aed4d085ebdee..3b360d9a087a368e6ef76b5e84609f5c832c8120 100644 (file)
--- a/src/plugins/lua/fann_classifier.lua
+++ b/src/plugins/lua/fann_classifier.lua
@@ -89,8 +89,7 @@ local function maybe_load_fann(task, continue_cb, call_if_fail)
       {key, 'version', 'data', 'spam', 'ham'} -- arguments
     )
     if not ret then
-      rspamd_logger.errx(task, 'redis error on host %s', upstream:get_addr())
-      upstream:fail()
+      rspamd_logger.err(task, 'got error connecting to redis')
     end
   end
 
@@ -124,8 +123,7 @@ local function maybe_load_fann(task, continue_cb, call_if_fail)
       {key, 'version'} -- arguments
     )
     if not ret then
-      rspamd_logger.errx(task, 'redis error on host %s', upstream:get_addr())
-      upstream:fail()
+      rspamd_logger.err(task, 'got error connecting to redis')
     end
   end
 
@@ -227,8 +225,7 @@ local function save_fann(task, is_spam)
       conn:add_cmd('HINCRBY', {key, 'ham', 1})
     end
   else
-    rspamd_logger.errx(task, 'redis error on host %s: %s', upstream:get_addr())
-    upstream:fail()
+    rspamd_logger.err(task, 'got error connecting to redis')
   end
 end
 

diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
index 354c2b3d2d7601b487ad18173ebdd6cb46ff82d9..36819e1d0f9a43c56bd5a7d495939030993aed10 100644 (file)
--- a/src/plugins/lua/greylist.lua
+++ b/src/plugins/lua/greylist.lua
@@ -225,8 +225,7 @@ local function greylist_check(task)
     {body_key, meta_key} -- arguments
   )
   if not ret then
-    rspamd_logger.errx(task, 'cannot make redis request to check results')
-    upstream:fail()
+    rspamd_logger.err(task, 'cannot make redis request to check results')
   end
 end
 
@@ -304,8 +303,7 @@ local function greylist_set(task)
         meta_key, tostring(settings['expire'])
       })
     else
-     rspamd_logger.infox(task, 'got error while connecting to redis: %1', upstream:get_addr())
-     upstream:fail()
+      rspamd_logger.err(task, 'got error while connecting to redis')
     end
   elseif do_greylisting or do_greylisting_required then
     local t = tostring(math.floor(rspamd_util.get_time()))
@@ -329,9 +327,7 @@ local function greylist_set(task)
         meta_key, tostring(settings['expire']), t
       })
     else
-      rspamd_logger.infox(task, 'got error while connecting to redis: %s',
-      upstream:get_addr())
-      upstream:fail()
+      rspamd_logger.err(task, 'got error while connecting to redis')
     end
   else
     if action ~= 'no action' and action ~= 'reject' then

diff --git a/src/plugins/lua/ip_score.lua b/src/plugins/lua/ip_score.lua
index d8f61f511aebffa0fdb84d0db33fe4e93d207e3c..ffffb22b18c2637ec72efb573fcae64842394329 100644 (file)
--- a/src/plugins/lua/ip_score.lua
+++ b/src/plugins/lua/ip_score.lua
@@ -166,8 +166,7 @@ local ip_score_set = function(task)
     redis_args -- arguments
   )
   if not ret then
-    rspamd_logger.errx(task, 'Redis HMSET failed on %s', upstream:get_addr())
-    upstream:fail()
+    rspamd_logger.err(task, 'error connecting to redis')
     return
   end
 
@@ -320,8 +319,7 @@ local ip_score_check = function(task)
       args -- arguments
     )
     if not ret then
-      rspamd_logger.errx(task, 'Call to redis at %s failed', upstream:get_addr())
-      upstream:fail()
+      rspamd_logger.err(task, 'error connecting to redis')
     end
   end
 end

diff --git a/src/plugins/lua/metadata_exporter.lua b/src/plugins/lua/metadata_exporter.lua
index 70c10e6b76eca706d351af360f87c4b5dd1cc916..d2c0fa620b7dcb786315524815cb26d6da591189 100644 (file)
--- a/src/plugins/lua/metadata_exporter.lua
+++ b/src/plugins/lua/metadata_exporter.lua
@@ -93,8 +93,7 @@ local function metadata_exporter(task)
       {channel, data} -- arguments
     )
     if not ret then
-      rspamd_logger.errx(task, 'Redis PUBLISH failed')
-      upstream:fail()
+      rspamd_logger.err(task, 'error connecting to redis')
     end
   end
   if url then

diff --git a/src/plugins/lua/mx_check.lua b/src/plugins/lua/mx_check.lua
index fbf68d6d717ff5a7fe02940ea3762ecbf1d01b5d..f5a44bc4e1a20d28145954751e49ca13edb0941d 100644 (file)
--- a/src/plugins/lua/mx_check.lua
+++ b/src/plugins/lua/mx_check.lua
@@ -90,8 +90,7 @@ local function mx_check(task)
           {key, tostring(settings.expire_novalid), '0'} -- arguments
         )
         if not ret then
-          rspamd_logger.errx(task, 'Redis SETEX failed')
-          upstream:fail()
+          rspamd_logger.err(task, 'got error connecting to redis')
         end
       else
         local valid_mx = {}
@@ -108,8 +107,7 @@ local function mx_check(task)
           {key, tostring(settings.expire), table.concat(valid_mx, ';')} -- arguments
         )
         if not ret then
-          rspamd_logger.errx(task, 'Redis SETEX failed')
-          upstream:fail()
+          rspamd_logger.err(task, 'error connecting to redis')
         end
       end
     end

diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index 92d80fe32c12200e63b6d16362d1cc57b4da28bb..f15d8633ef153bb08aa47412eda9ecfbb1a93ffb 100644 (file)
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -308,8 +308,7 @@ local function check_limits(task, args)
     fun.totable(fun.map(function(l) return l[2] end, args)) -- arguments
   )
   if not ret then
-    rspamd_logger.errx(task, 'Redis MGET failed on %s', upstream:get_addr())
-    upstream:fail()
+    rspamd_logger.err(task, 'got error connecting to redis')
   end
 end
 
@@ -378,8 +377,7 @@ local function set_limits(task, args)
           conn:add_cmd('setex', v)
         end, fun.drop_n(1, values))
       else
-        rspamd_logger.infox(task, 'got error while connecting to redis: %1', upstream:get_addr())
-        upstream:fail()
+        rspamd_logger.err(task, 'got error while connecting to redis')
       end
     end
   end
@@ -394,8 +392,7 @@ local function set_limits(task, args)
     fun.totable(fun.map(function(l) return l[2] end, args)) -- arguments
   )
   if not ret then
-    rspamd_logger.errx(task, 'Redis MGET failed on %s', upstream:get_addr())
-    upstream:fail()
+    rspamd_logger.err(task, 'got error connecting to redis')
   end
 end