From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 1 Apr 2019 12:51:03 +0000 (+0100)
Subject: [Minor] Spamassassin: Add messages about rules loading
X-Git-Tag: 1.9.1~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=302da75c22217d0c8c0a6a868b85e81df8f63dd0;p=rspamd.git

[Minor] Spamassassin: Add messages about rules loading

Issue: #2828
Closes: #2828
---

diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index 9160b57c6..2e34201a4 100644
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -1616,28 +1616,39 @@ if type(section) == "table" then
         for _, elt in ipairs(fn) do
           local files = util.glob(elt)
 
+          if not files or #files == 0 then
+            rspamd_logger.errx(rspamd_config, "cannot find any files matching pattern %s", elt)
+          else
+            for _,matched in ipairs(files) do
+              local f = io.open(matched, "r")
+              if f then
+                rspamd_logger.infox(rspamd_config, 'loading SA rules from %s', matched)
+                process_sa_conf(f)
+                has_rules = true
+              else
+                rspamd_logger.errx(rspamd_config, "cannot open %1", matched)
+              end
+            end
+          end
+        end
+      else
+        -- assume string
+        local files = util.glob(fn)
+
+        if not files or #files == 0 then
+          rspamd_logger.errx(rspamd_config, "cannot find any files matching pattern %s", fn)
+        else
           for _,matched in ipairs(files) do
             local f = io.open(matched, "r")
             if f then
+              rspamd_logger.infox(rspamd_config, 'loading SA rules from %s', matched)
               process_sa_conf(f)
               has_rules = true
             else
               rspamd_logger.errx(rspamd_config, "cannot open %1", matched)
             end
           end
-        end
-      else
-        -- assume string
-        local files = util.glob(fn)
 
-        for _,matched in ipairs(files) do
-          local f = io.open(matched, "r")
-          if f then
-            process_sa_conf(f)
-            has_rules = true
-          else
-            rspamd_logger.errx(rspamd_config, "cannot open %1", matched)
-          end
         end
       end
     end