Fix reading maps.

diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 48a9ceb11414024e728328104362df9424346bfd..84825dbbd31f8402b9bbd76395c656ce67c53c6d 100644 (file)
--- 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