diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-10-08 11:17:20 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-10-08 11:17:20 +0100 |
| commit | ecd357f4b09a485537cde1699d3b64a1e87a4101 (patch) | |
| tree | e22b3025458e5262218a22adb8d55ba5680c1c55 /src/plugins/regexp.c | |
| parent | 8de4f25c4a3f1337ff3c0efb7ef646bfc4104982 (diff) | |
| download | rspamd-ecd357f4b09a485537cde1699d3b64a1e87a4101.tar.gz rspamd-ecd357f4b09a485537cde1699d3b64a1e87a4101.zip | |
[Minor] Further steps to get rid of metrics support
Diffstat (limited to 'src/plugins/regexp.c')
| -rw-r--r-- | src/plugins/regexp.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c index f73a31bd4..bd016ac82 100644 --- a/src/plugins/regexp.c +++ b/src/plugins/regexp.c @@ -189,8 +189,7 @@ regexp_module_config (struct rspamd_config *cfg) nlua ++; } else if (value->type == UCL_OBJECT) { - const gchar *description = NULL, *group = NULL, - *metric = DEFAULT_METRIC; + const gchar *description = NULL, *group = NULL; gdouble score = 0.0; guint flags = 0, priority = 0; gboolean is_lua = FALSE, valid_expression = TRUE; @@ -254,12 +253,6 @@ regexp_module_config (struct rspamd_config *cfg) conddata->L, conddata->idx); } - elt = ucl_object_lookup (value, "metric"); - - if (elt) { - metric = ucl_object_tostring (elt); - } - elt = ucl_object_lookup (value, "description"); if (elt) { @@ -310,7 +303,7 @@ regexp_module_config (struct rspamd_config *cfg) priority = ucl_object_toint (elt); } - rspamd_config_add_metric_symbol (cfg, metric, cur_item->symbol, + rspamd_config_add_metric_symbol (cfg, cur_item->symbol, score, description, group, flags, priority, nshots); } } |