From: Carsten Rosenberg <c.rosenberg@heinlein-support.de>
Date: Wed, 4 Mar 2020 20:04:10 +0000 (+0100)
Subject: [Fix] metadata_exporter default formatter
X-Git-Tag: 2.5~96^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F3288%2Fhead;p=rspamd.git

[Fix] metadata_exporter default formatter
---

diff --git a/src/plugins/lua/metadata_exporter.lua b/src/plugins/lua/metadata_exporter.lua
index 172b55811..27b0b10f6 100644
--- a/src/plugins/lua/metadata_exporter.lua
+++ b/src/plugins/lua/metadata_exporter.lua
@@ -144,7 +144,7 @@ end
 
 local formatters = {
   default = function(task)
-    return task:get_content()
+    return task:get_content(), {}
   end,
   email_alert = function(task, rule, extra)
     local meta = get_general_metadata(task, true)
@@ -306,7 +306,7 @@ local pushers = {
       host = rule.smtp,
       port = rule.smtp_port or settings.smtp_port or 25,
       from = rule.mail_from or settings.mail_from,
-      recipients = extra.mail_targets,
+      recipients = extra.mail_targets or rule.mail_to or settings.mail_to,
       helo = rule.helo or settings.helo,
       timeout = rule.timeout or settings.timeout,
     }, formatted, sendmail_cb)