From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 11 Sep 2017 18:13:21 +0000 (+0100)
Subject: [Minor] Improve logging in antivirus module
X-Git-Tag: 1.7.0~653
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=678f31bbe6ad07767984db5f22b4ffd47909e0f6;p=thirdparty%2Frspamd.git

[Minor] Improve logging in antivirus module
---

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index 4802b239e1..2b072f096b 100644
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -268,7 +268,11 @@ end
 local function message_not_too_large(task, rule)
   local max_size = tonumber(rule['max_size'])
   if not max_size then return true end
-  if task:get_size() > max_size then return false end
+  if task:get_size() > max_size then
+    rspamd_loger.infox("skip %s AV check as it is too large: %s (%s is allowed)",
+      rule.type, task:get_size(), max_size)
+    return false
+  end
   return true
 end
 
@@ -280,6 +284,9 @@ local function need_av_check(task, rule)
       end
     end
 
+    rspamd_loger.infox("skip %s AV check as there are no attachments in a message",
+      rule.type)
+
     return false
   else
     return message_not_too_large(task, rule)
@@ -753,6 +760,7 @@ local function add_antivirus_rule(sym, opts)
   end
 
   rule = cfg.configure(opts)
+  rule.type = opts.type
 
   if not rule then
     rspamd_logger.errx(rspamd_config, 'cannot configure %s for %s',