Bläddra i källkod

[Minor] Spamassassin: Add messages about rules loading

Issue: #2828
Closes: #2828
tags/1.9.1
Vsevolod Stakhov 5 år sedan
förälder
incheckning
302da75c22
1 ändrade filer med 23 tillägg och 12 borttagningar
  1. 23
    12
      src/plugins/lua/spamassassin.lua

+ 23
- 12
src/plugins/lua/spamassassin.lua Visa fil

@@ -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

Laddar…
Avbryt
Spara