Browse Source

Fix configtest

tags/1.1.0
Vsevolod Stakhov 8 years ago
parent
commit
e3a8756d4f
3 changed files with 9 additions and 8 deletions
  1. 2
    2
      src/libserver/cfg_utils.c
  2. 1
    1
      src/rspamadm/configdump.c
  3. 6
    5
      src/rspamadm/configtest.c

+ 2
- 2
src/libserver/cfg_utils.c View File

@@ -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

+ 1
- 1
src/rspamadm/configdump.c View File

@@ -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;


+ 6
- 5
src/rspamadm/configtest.c View File

@@ -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) {

Loading…
Cancel
Save