From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 20 Aug 2014 14:35:16 +0000 (+0100)
Subject: Fix reading maps.
X-Git-Tag: 0.7.0~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=860137188b96208fad7e3931fd632998aa33979d;p=thirdparty%2Frspamd.git

Fix reading maps.
---

diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 48a9ceb114..84825dbbd3 100644
--- a/src/plugins/lua/settings.lua
+++ b/src/plugins/lua/settings.lua
@@ -315,12 +315,18 @@ end
 
 -- Parse settings map from the ucl line
 local function process_settings_map(string)
-  local ucl_parser = require "ucl.parser"
-  local res,err = ucl_parser:parse_string(string)
+  local ucl = require "ucl"
+  local parser = ucl.parser(1)
+  local res,err = parser:parse_string(string)
   if not res then
-    rspamd_log.warn('cannot parse settings map: ' .. err)
+    rspamd_logger.warn('cannot parse settings map: ' .. err)
   else
-    process_settings_table(res)
+    local obj = parser:get_object()
+    if obj['settings'] then
+      process_settings_table(obj['settings'])
+    else
+      process_settings_table(obj)
+    end
   end
 end