瀏覽代碼

[Minor] Fix config transformation with no groups

tags/1.7.0
Vsevolod Stakhov 6 年之前
父節點
當前提交
65967cdddf
共有 2 個檔案被更改,包括 7 行新增6 行删除
  1. 6
    0
      lualib/rspamd_config_transform.lua
  2. 1
    6
      src/rspamadm/configdump.c

+ 6
- 0
lualib/rspamd_config_transform.lua 查看文件

@@ -209,6 +209,12 @@ local function convert_metric(cfg, metric)
for k, v in metric_pairs(metric.group) do
group_transform(cfg, k, v)
end
else
cfg.group = {
ungrouped = {
symbols = {}
}
}
end

if metric.symbol then

+ 1
- 6
src/rspamadm/configdump.c 查看文件

@@ -284,7 +284,6 @@ rspamadm_configdump (gint argc, gchar **argv)
}
else {
/* Do post-load actions */
rspamd_lua_set_path (cfg->lua_state, cfg->rcl_obj, ucl_vars);
rspamd_lua_post_load_config (cfg);

if (!rspamd_init_filters (rspamd_main->cfg, FALSE)) {
@@ -328,9 +327,5 @@ rspamadm_configdump (gint argc, gchar **argv)
}
}

if (!ret) {
exit (EXIT_FAILURE);
}

exit (EXIT_SUCCESS);
exit (ret ? EXIT_SUCCESS : EXIT_FAILURE);
}

Loading…
取消
儲存