From f8fbf1dd71c081539865c2eddb14a71f10c26fe2 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 1 Sep 2015 12:23:46 +0100
Subject: Update logging in lua modules.

---
 src/plugins/lua/multimap.lua | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/plugins/lua/multimap.lua')

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 3f41921f1..d821902ea 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -148,13 +148,13 @@ end
 
 local function add_multimap_rule(key, newrule)
   if not newrule['map'] then
-    rspamd_logger.err('incomplete rule')
+    rspamd_logger.errx(rspamd_config, 'incomplete rule')
     return nil
   end
   if not newrule['symbol'] and key then
     newrule['symbol'] = key
   elseif not newrule['symbol'] then
-    rspamd_logger.err('incomplete rule')
+    rspamd_logger.errx(rspamd_config, 'incomplete rule')
     return nil
   end
   -- Check cdb flag
@@ -164,22 +164,26 @@ local function add_multimap_rule(key, newrule)
     if newrule['cdb'] then
       return newrule
     else
-      rspamd_logger.warn('Cannot add rule: map doesn\'t exists: ' .. newrule['map'])
+      rspamd_logger.warnx(rspamd_config, 'Cannot add rule: map doesn\'t exists: %1',
+          newrule['map'])
     end
   else
     if newrule['type'] == 'ip' then
-      newrule['radix'] = rspamd_config:add_radix_map (newrule['map'], newrule['description'])
+      newrule['radix'] = rspamd_config:add_radix_map (newrule['map'],
+        newrule['description'])
       if newrule['radix'] then
         return newrule
       else
-        rspamd_logger.warn('Cannot add rule: map doesn\'t exists: ' .. newrule['map'])
+        rspamd_logger.warnx(rspamd_config, 'Cannot add rule: map doesn\'t exists: %1',
+            newrule['map'])
       end
     elseif newrule['type'] == 'header' or newrule['type'] == 'rcpt' or newrule['type'] == 'from' then
       newrule['hash'] = rspamd_config:add_hash_map (newrule['map'], newrule['description'])
       if newrule['hash'] then
         return newrule
       else
-        rspamd_logger.warn('Cannot add rule: map doesn\'t exists: ' .. newrule['map'])
+        rspamd_logger.warnx(rspamd_config, 'Cannot add rule: map doesn\'t exists: %1',
+          newrule['map'])
       end
     elseif newrule['type'] == 'dnsbl' then
       return newrule 
@@ -195,12 +199,12 @@ if opts and type(opts) == 'table' then
     if type(m) == 'table' then
       local rule = add_multimap_rule(k, m)
       if not rule then
-        rspamd_logger.err('cannot add rule: "'..k..'"')
+        rspamd_logger.errx(rspamd_config, 'cannot add rule: "'..k..'"')
       else
         table.insert(rules, rule)
       end
     else
-      rspamd_logger.err('parameter ' .. k .. ' is invalid, must be an object')
+      rspamd_logger.errx(rspamd_config, 'parameter ' .. k .. ' is invalid, must be an object')
     end
   end
   -- add fake symbol to check all maps inside a single callback
-- 
cgit v1.2.3