diff options
| -rw-r--r-- | src/libserver/cfg_utils.c | 4 | ||||
| -rw-r--r-- | src/rspamadm/configdump.c | 2 | ||||
| -rw-r--r-- | src/rspamadm/configtest.c | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index 4fdc78526..9447eaf32 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -658,7 +658,7 @@ rspamd_config_post_load (struct rspamd_config *cfg, gboolean validate_cache) rspamd_url_init (cfg->tld_file); /* Insert classifiers symbols */ - (void)rspamd_config_insert_classify_symbols (cfg); + rspamd_config_insert_classify_symbols (cfg); /* Parse format string that we have */ if (!rspamd_config_parse_log_format (cfg)) { @@ -986,7 +986,7 @@ symbols_classifiers_callback (gpointer key, gpointer value, gpointer ud) /* Actually, statistics should act like any ordinary symbol */ rspamd_symbols_cache_add_symbol (cfg->cache, key, 0, NULL, NULL, - SYMBOL_TYPE_COMPOSITE, -1); + SYMBOL_TYPE_CLASSIFIER, -1); } void diff --git a/src/rspamadm/configdump.c b/src/rspamadm/configdump.c index 1e169f791..fbff4b23b 100644 --- a/src/rspamadm/configdump.c +++ b/src/rspamadm/configdump.c @@ -129,7 +129,7 @@ rspamadm_configdump (gint argc, gchar **argv) const gchar *confdir; const ucl_object_t *obj, *cur; struct rspamd_config *cfg = rspamd_main->cfg; - gboolean ret = FALSE; + gboolean ret = TRUE; worker_t **pworker; gchar **sec; diff --git a/src/rspamadm/configtest.c b/src/rspamadm/configtest.c index 9c8353312..26bdd0286 100644 --- a/src/rspamadm/configtest.c +++ b/src/rspamadm/configtest.c @@ -106,7 +106,7 @@ rspamadm_configtest (gint argc, gchar **argv) GError *error = NULL; const gchar *confdir; struct rspamd_config *cfg = rspamd_main->cfg; - gboolean ret = FALSE; + gboolean ret = TRUE; worker_t **pworker; const guint64 *log_cnt; @@ -156,15 +156,16 @@ rspamadm_configtest (gint argc, gchar **argv) if (!rspamd_init_filters (rspamd_main->cfg, FALSE)) { ret = FALSE; } + + if (ret) { + ret = rspamd_config_post_load (cfg, FALSE); + } + if (!rspamd_symbols_cache_validate (rspamd_main->cfg->cache, rspamd_main->cfg, FALSE)) { ret = FALSE; } - - if (ret) { - ret = rspamd_config_post_load (cfg, FALSE); - } } if (strict && ret) { |