From: Andrew Lewis <nerf@judo.za.org>
Date: Fri, 7 Apr 2017 13:29:27 +0000 (+0200)
Subject: [Minor] Antivirus: process table results correctly; prettify logging
X-Git-Tag: 1.5.5~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b9ef79d942ab8c71b2b05ca9d0d1adb01d1f0755;p=rspamd.git

[Minor] Antivirus: process table results correctly; prettify logging
---

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index e10f7f3fc..277a95c2b 100644
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -50,14 +50,17 @@ local function yield_result(task, rule, vname)
     for _, vn in ipairs(vname) do
       local symname = match_patterns(rule['symbol'], vn, rule['patterns'])
       if rule['whitelist'] and rule['whitelist']:get_key(vn) then
-        rspamd_logger.infox(task, '%s: "%s" is in whitelist', rule['type'], vname)
+        rspamd_logger.infox(task, '%s: "%s" is in whitelist', rule['type'], vn)
       else
-        task:insert_result(symname, 1.0, vname)
-        rspamd_logger.infox(task, '%s: virus found: "%s"', rule['type'], vname)
+        task:insert_result(symname, 1.0, vn)
+        rspamd_logger.infox(task, '%s: virus found: "%s"', rule['type'], vn)
       end
     end
   end
   if rule['action'] then
+    if type(vname) == 'table' then
+      vname = table.concat(vname, '; ')
+    end
     task:set_pre_result(rule['action'],
         string.format('%s: virus found: "%s"', rule['type'], vname))
   end