diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-04-14 22:48:04 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-04-14 22:48:04 +0100 |
| commit | 1259f3bb95bb5b450cc1543f9dae701bf4fe7fcb (patch) | |
| tree | 1b1f67ced7a80bf727a08718107c3aa1ff20058b | |
| parent | 0cd20e38394e83ea6217f08307b9082542ded730 (diff) | |
| download | rspamd-1259f3bb95bb5b450cc1543f9dae701bf4fe7fcb.tar.gz rspamd-1259f3bb95bb5b450cc1543f9dae701bf4fe7fcb.zip | |
More bugs in groups configuration.
| -rw-r--r-- | src/libserver/cfg_rcl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index cfadea9a6..7b2bae767 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -333,6 +333,9 @@ rspamd_rcl_insert_symbol (struct rspamd_config *cfg, struct metric *metric, sym_def->description = (gchar *)description; sym_def->one_shot = one_shot; + msg_debug ("registered symbol %s with weight %.2f in metric %s and group %s", + sym_def->name, symbol_score, metric->name, group); + g_hash_table_insert (metric->symbols, sym_def->name, sym_def); if ((metric_list = @@ -362,6 +365,8 @@ rspamd_rcl_insert_symbol (struct rspamd_config *cfg, struct metric *metric, g_hash_table_insert (cfg->symbols_groups, sym_group->name, sym_group); } + sym_def->gr = sym_group; + LL_PREPEND (sym_group->symbols, sym_def); return TRUE; @@ -384,7 +389,7 @@ rspamd_rcl_symbols_handler (rspamd_mempool_t *pool, const ucl_object_t *obj, } it = NULL; while ((cur = ucl_iterate_object (val, &it, true)) != NULL) { - if (!rspamd_rcl_insert_symbol (cfg, metric, cur, NULL, FALSE, err)) { + if (!rspamd_rcl_insert_symbol (cfg, metric, cur, group, FALSE, err)) { return FALSE; } } @@ -403,7 +408,7 @@ rspamd_rcl_symbols_handler (rspamd_mempool_t *pool, const ucl_object_t *obj, it = NULL; while ((cur = ucl_iterate_object (val, &it, false)) != NULL) { - if (!rspamd_rcl_insert_symbol (cfg, metric, cur, NULL, TRUE, err)) { + if (!rspamd_rcl_insert_symbol (cfg, metric, cur, group, TRUE, err)) { return FALSE; } } |