[Minor] Use infox instead of info in logging

diff --git a/src/plugins/lua/asn.lua b/src/plugins/lua/asn.lua
index 5fab04d8f10ee278fb1115b7a170eea8251c8404..74672af271bebf87d8f3433f30f71c3e78aad552 100644 (file)
--- a/src/plugins/lua/asn.lua
+++ b/src/plugins/lua/asn.lua
@@ -75,7 +75,7 @@ local configure_asn_module = function()
   local opts =  rspamd_config:get_all_opt('asn')
   if opts then
     if opts['enabled'] == false then
-      rspamd_logger.info('Module is disabled')
+      rspamd_logger.infox(rspamd_config, 'module is disabled')
       return
     end
     for k,v in pairs(opts) do

diff --git a/src/plugins/lua/dcc.lua b/src/plugins/lua/dcc.lua
index ae6a3661a8193c72e1e1e98669ea314b7f5dfba3..7c3616073c1042c8b14f871e051c6cb4d3a931a2 100644 (file)
--- a/src/plugins/lua/dcc.lua
+++ b/src/plugins/lua/dcc.lua
@@ -117,7 +117,7 @@ end
 -- Configuration
 if opts and opts['host'] then
   if opts['enabled'] == false then
-    logger.info('Module is disabled')
+    logger.infox(rspamd_config, 'module is disabled')
     return
   end
   rspamd_config:register_symbol({

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 8d04c4fbb978ac991e12ea33ffefbdacc9ce8fee..f2faef89fd2ec6d4933039709ca0cc925b8423cc 100644 (file)
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -329,7 +329,7 @@ if not opts or type(opts) ~= 'table' then
 end
 
 if opts['enabled'] == false then
-  rspamd_logger.info('Module is disabled')
+  rspamd_logger.infox(rspamd_config, 'module is disabled')
   return
 end
 

diff --git a/src/plugins/lua/emails.lua b/src/plugins/lua/emails.lua
index 74358d1e21aeed8743f82ff328dc959cdfba919e..3d0fddd6aa945893066c7d342b4aca3770b24f65 100644 (file)
--- a/src/plugins/lua/emails.lua
+++ b/src/plugins/lua/emails.lua
@@ -82,7 +82,7 @@ end
 local opts =  rspamd_config:get_all_opt('emails', 'rule')
 if opts and type(opts) == 'table' then
   if opts['enabled'] == false then
-    logger.info('Module is disabled')
+    logger.infox(rspamd_config, 'module is disabled')
     return
   end
   local r = opts['rule']

diff --git a/src/plugins/lua/forged_recipients.lua b/src/plugins/lua/forged_recipients.lua
index 5b7d71fc432fa01f5da001c5a24ceb4f75fda475..4c52295b9d94f35f10b2645513a342bf057d88fd 100644 (file)
--- a/src/plugins/lua/forged_recipients.lua
+++ b/src/plugins/lua/forged_recipients.lua
@@ -73,7 +73,7 @@ end
 local opts =  rspamd_config:get_all_opt('forged_recipients')
 if opts then
   if opts['enabled'] == false then
-    logger.info('Module is disabled')
+    logger.infox(rspamd_config, 'Module is disabled')
     return
   end
   if opts['symbol_rcpt'] or opts['symbol_sender'] then

diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
index ddb2da60285be79e0422288877a7168c212d7cb7..71a8a86cae23cf65776c0b7af51fe701d7bcad3c 100644 (file)
--- a/src/plugins/lua/greylist.lua
+++ b/src/plugins/lua/greylist.lua
@@ -322,7 +322,7 @@ end
 local opts =  rspamd_config:get_all_opt('greylist')
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   if opts['whitelisted_ip'] then

diff --git a/src/plugins/lua/hfilter.lua b/src/plugins/lua/hfilter.lua
index fad71560715e238c9fc2b78cbdecf664ca24e136..b11b567b74fe1b64c364832c2e68eb2fa59576c4 100644 (file)
--- a/src/plugins/lua/hfilter.lua
+++ b/src/plugins/lua/hfilter.lua
@@ -482,7 +482,7 @@ local symbols_from = {
 local opts = rspamd_config:get_all_opt('hfilter')
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   for k,v in pairs(opts) do

diff --git a/src/plugins/lua/ip_score.lua b/src/plugins/lua/ip_score.lua
index 12430241b971669e9b08821b1c56f3d78924fc13..bb6119bdafb0acf5d3e7b662cc2fe7815c652be7 100644 (file)
--- a/src/plugins/lua/ip_score.lua
+++ b/src/plugins/lua/ip_score.lua
@@ -318,7 +318,7 @@ local configure_ip_score_module = function()
   local opts =  rspamd_config:get_all_opt('ip_score')
   if opts then
     if opts['enabled'] == false then
-      rspamd_logger.info('Module is disabled')
+      rspamd_logger.infox(rspamd_config, 'module is disabled')
       return
     end
     for k,v in pairs(opts) do

diff --git a/src/plugins/lua/maillist.lua b/src/plugins/lua/maillist.lua
index 96807cd3de459ce6a3b7ca4e33af408b12406d4b..4ec0a41f17dcade0251a0af77eb45d7bdb92a0f4 100644 (file)
--- a/src/plugins/lua/maillist.lua
+++ b/src/plugins/lua/maillist.lua
@@ -273,7 +273,7 @@ end
 local opts =  rspamd_config:get_all_opt('maillist')
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   if opts['symbol'] then

diff --git a/src/plugins/lua/mime_types.lua b/src/plugins/lua/mime_types.lua
index c6fb499dffbe95b11ff798f45ea283ec18be7983..ad725820b7d1e7070675c9c6352b0e516ec040ef 100644 (file)
--- a/src/plugins/lua/mime_types.lua
+++ b/src/plugins/lua/mime_types.lua
@@ -201,7 +201,7 @@ end
 local opts =  rspamd_config:get_all_opt('mime_types')
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   for k,v in pairs(opts) do

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 7cba9fd3a63e78a10d6b9ad7aaafa10eed3f38b3..a1333d7d9a1b8bf4f1037bf4af789d06972fcb1d 100644 (file)
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -775,7 +775,7 @@ end
 local opts =  rspamd_config:get_all_opt('multimap')
 if opts and type(opts) == 'table' then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   redis_params = rspamd_parse_redis_server('multimap')

diff --git a/src/plugins/lua/once_received.lua b/src/plugins/lua/once_received.lua
index 3012205d6dcded0137dc82a5facaad683ee9e732..84b0e48b4453ba94c34f86f0be8d94b7dd144973 100644 (file)
--- a/src/plugins/lua/once_received.lua
+++ b/src/plugins/lua/once_received.lua
@@ -143,7 +143,7 @@ end
 local opts =  rspamd_config:get_all_opt('once_received')
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   if opts['symbol'] then

diff --git a/src/plugins/lua/phishing.lua b/src/plugins/lua/phishing.lua
index c4ccfca3ce855fb71454ca61ce017a989768fa06..e38ceeac9777d09a18c4030e77a5b9093c0c9e56 100644 (file)
--- a/src/plugins/lua/phishing.lua
+++ b/src/plugins/lua/phishing.lua
@@ -334,6 +334,9 @@ local function phishtank_json_cb(string)
 end
 
 if opts then
+  if opts['enabled'] == false then
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
+  end
   if opts['symbol'] then
     symbol = opts['symbol']
     -- Register symbol's callback

diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index a92c03d3a13a9b289a89d797ae3a3ccf203154a9..2e67a55244525baa8b033c82dd4e31673804884c 100644 (file)
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -443,7 +443,7 @@ end
 local opts = rspamd_config:get_all_opt('ratelimit')
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   local rates = opts['limit']

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index d782d1c25949668ad8d9740ae6a136a5d5259070..f22199b63ada8b7f2e1fc93913651f9b4227a392 100644 (file)
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -388,7 +388,7 @@ local opts = rspamd_config:get_all_opt('rbl')
 if not (opts and type(opts) == 'table') then
   rspamd_logger.info('Module is unconfigured')
 elseif opts['enabled'] == false then
-  rspamd_logger.info('Module is disabled')
+  rspamd_logger.infox(rspamd_config, 'module is disabled')
   return
 end
 

diff --git a/src/plugins/lua/replies.lua b/src/plugins/lua/replies.lua
index 39eb3705b86d84065ce43db810c31b4114962fd6..d6793a3d87f4077158a599eaa685cde472aa6e20 100644 (file)
--- a/src/plugins/lua/replies.lua
+++ b/src/plugins/lua/replies.lua
@@ -110,10 +110,10 @@ end
 local opts = rspamd_config:get_all_opt('replies')
 if opts then
   if not (opts and type(opts) == 'table') then
-    rspamd_logger.info('Module is unconfigured')
+    rspamd_logger.infox(rspamd_config, 'module is unconfigured')
     return
   elseif opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   redis_params = rspamd_parse_redis_server('replies')

diff --git a/src/plugins/lua/rspamd_update.lua b/src/plugins/lua/rspamd_update.lua
index c4f1a7e987e2e661a120a5ac0cf168bc884e2fda..779cec2ddc93f9ef79b78286b5f281b2f08cc19a 100644 (file)
--- a/src/plugins/lua/rspamd_update.lua
+++ b/src/plugins/lua/rspamd_update.lua
@@ -126,7 +126,7 @@ end
 local section = rspamd_config:get_all_opt("rspamd_update")
 if section then
   if section['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   local trusted_key

diff --git a/src/plugins/lua/trie.lua b/src/plugins/lua/trie.lua
index 783255b89ee63adb8a03676659623ed4a249f7b2..927efbc26c987a685dd78ebcfc6920eba384275a 100644 (file)
--- a/src/plugins/lua/trie.lua
+++ b/src/plugins/lua/trie.lua
@@ -131,7 +131,7 @@ end
 local opts =  rspamd_config:get_all_opt("trie")
 if opts then
   if opts['enabled'] == false then
-    rspamd_logger.info('Module is disabled')
+    rspamd_logger.infox(rspamd_config, 'module is disabled')
     return
   end
   for sym, opt in pairs(opts) do

diff --git a/src/plugins/lua/whitelist.lua b/src/plugins/lua/whitelist.lua
index b0b00114ece0a9b234be76a977303f4fd52f3e9a..7344a1d67ae825a784d7ffccd92a4682b46ead5c 100644 (file)
--- a/src/plugins/lua/whitelist.lua
+++ b/src/plugins/lua/whitelist.lua
@@ -186,14 +186,14 @@ local configure_whitelist_module = function()
   local opts =  rspamd_config:get_all_opt('whitelist')
   if opts then
     if opts['enabled'] == false then
-      rspamd_logger.info('Module is disabled')
+      rspamd_logger.infox(rspamd_config, 'module is disabled')
       return
     end
     for k,v in pairs(opts) do
       options[k] = v
     end
   else
-    rspamd_logger.info('Module is unconfigured')
+    rspamd_logger.infox(rspamd_config, 'Module is unconfigured')
     return
   end