From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 31 Oct 2018 22:36:29 +0000 (+0000)
Subject: [Fix] Restore URLs exporting in ClickHouse plugin
X-Git-Tag: 1.8.2~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea06f2591ccf116b201ca70b25d3d5e019d7a0e;p=thirdparty%2Frspamd.git

[Fix] Restore URLs exporting in ClickHouse plugin
---

diff --git a/src/plugins/lua/clickhouse.lua b/src/plugins/lua/clickhouse.lua
index 556de40ef2..87ae8dff64 100644
--- a/src/plugins/lua/clickhouse.lua
+++ b/src/plugins/lua/clickhouse.lua
@@ -489,10 +489,15 @@ local function clickhouse_collect(task)
     table.insert(row, {})
   end
 
+  local flatten_urls = function(...)
+    return fun.totable(fun.map(function(k,_) return k end, ...))
+  end
+
   -- Urls step
   local urls_tlds = {}
   local urls_urls = {}
   if task:has_urls(false) then
+
     for _,u in ipairs(task:get_urls(false)) do
       urls_tlds[u:get_tld()] = true
       if settings['full_urls'] then
@@ -501,13 +506,7 @@ local function clickhouse_collect(task)
         urls_urls[u:get_host()] = true
       end
     end
-  end
-
-  local flatten_urls = function(...)
-    return fun.totable(fun.map(function(k,_) return k end, ...))
-  end
 
-  if #urls_tlds > 0 then
     table.insert(row, flatten_urls(urls_tlds))
     table.insert(row, flatten_urls(urls_urls))
   else