diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-05-29 16:58:54 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-05-29 16:58:54 +0100 |
commit | e8366d156e09eba81ae38f57c41c74ec203c27bc (patch) | |
tree | 4e288c722057cf3948eeb659b4352b40b4eb9dbb /src/rspamadm | |
parent | 099cb8fb099054d2711c61ebfac1be05f9519748 (diff) | |
download | rspamd-e8366d156e09eba81ae38f57c41c74ec203c27bc.tar.gz rspamd-e8366d156e09eba81ae38f57c41c74ec203c27bc.zip |
[Minor] Rework config load routines
Diffstat (limited to 'src/rspamadm')
-rw-r--r-- | src/rspamadm/configdump.c | 3 | ||||
-rw-r--r-- | src/rspamadm/configtest.c | 3 | ||||
-rw-r--r-- | src/rspamadm/configwizard.c | 3 | ||||
-rw-r--r-- | src/rspamadm/rescore.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/rspamadm/configdump.c b/src/rspamadm/configdump.c index 486a74cef..bd776e586 100644 --- a/src/rspamadm/configdump.c +++ b/src/rspamadm/configdump.c @@ -283,8 +283,7 @@ rspamadm_configdump (gint argc, gchar **argv, const struct rspamadm_command *cmd cfg->compiled_workers = workers; cfg->cfg_name = config; - if (!rspamd_config_read (cfg, cfg->cfg_name, NULL, - config_logger, rspamd_main, ucl_vars)) { + if (!rspamd_config_read (cfg, cfg->cfg_name, config_logger, rspamd_main, ucl_vars)) { ret = FALSE; } else { diff --git a/src/rspamadm/configtest.c b/src/rspamadm/configtest.c index 94914e817..72a8f4945 100644 --- a/src/rspamadm/configtest.c +++ b/src/rspamadm/configtest.c @@ -141,8 +141,7 @@ rspamadm_configtest (gint argc, gchar **argv, const struct rspamadm_command *cmd cfg->compiled_workers = workers; cfg->cfg_name = config; - if (!rspamd_config_read (cfg, cfg->cfg_name, NULL, - config_logger, rspamd_main, ucl_vars)) { + if (!rspamd_config_read (cfg, cfg->cfg_name, config_logger, rspamd_main, ucl_vars)) { ret = FALSE; } else { diff --git a/src/rspamadm/configwizard.c b/src/rspamadm/configwizard.c index 5aaa94914..bfa35bb71 100644 --- a/src/rspamadm/configwizard.c +++ b/src/rspamadm/configwizard.c @@ -132,8 +132,7 @@ rspamadm_configwizard (gint argc, gchar **argv, cfg->compiled_workers = workers; cfg->cfg_name = config; - if (!rspamd_config_read (cfg, cfg->cfg_name, NULL, - config_logger, rspamd_main, ucl_vars)) { + if (!rspamd_config_read (cfg, cfg->cfg_name, config_logger, rspamd_main, ucl_vars)) { ret = FALSE; } else { diff --git a/src/rspamadm/rescore.c b/src/rspamadm/rescore.c index e30c6613a..346c49c68 100644 --- a/src/rspamadm/rescore.c +++ b/src/rspamadm/rescore.c @@ -150,8 +150,7 @@ rspamadm_rescore (gint argc, gchar **argv, const struct rspamadm_command *cmd) cfg->compiled_workers = workers; cfg->cfg_name = config; - if (!rspamd_config_read (cfg, cfg->cfg_name, NULL, - config_logger, rspamd_main, ucl_vars)) { + if (!rspamd_config_read (cfg, cfg->cfg_name, config_logger, rspamd_main, ucl_vars)) { ret = FALSE; } else { |