Ver código fonte

[Fix] Actively load skip hashes map in fuzzy storage

MFH: rspamd-1.6
tags/1.7.0
Vsevolod Stakhov 6 anos atrás
pai
commit
558229b49e
3 arquivos alterados com 15 adições e 3 exclusões
  1. 10
    2
      src/fuzzy_storage.c
  2. 4
    1
      src/libutil/map.c
  3. 1
    0
      src/libutil/map_private.h

+ 10
- 2
src/fuzzy_storage.c Ver arquivo

@@ -18,6 +18,7 @@
*/

#include <libserver/rspamd_control.h>
#include <src/libutil/map_private.h>
#include "config.h"
#include "util.h"
#include "rspamd.h"
@@ -2799,12 +2800,19 @@ start_fuzzy (struct rspamd_worker *worker)
&ctx->master_ips, NULL);
}
if (ctx->skip_map != NULL) {
if (!rspamd_map_add_from_ucl (cfg, ctx->skip_map,
struct rspamd_map *m;

if ((m = rspamd_map_add_from_ucl (cfg, ctx->skip_map,
"Skip hashes", rspamd_kv_list_read, rspamd_kv_list_fin,
(void **)&ctx->skip_hashes)) {
(void **)&ctx->skip_hashes)) == NULL) {
msg_warn_config ("cannot load hashes list from %s",
ucl_object_tostring (ctx->skip_map));
}
else {
if (worker->index == 0) {
m->active_http = TRUE;
}
}
}

/* Maps events */

+ 4
- 1
src/libutil/map.c Ver arquivo

@@ -1565,7 +1565,10 @@ rspamd_map_watch (struct rspamd_config *cfg, struct event_base *ev_base,
map = cur->data;
map->ev_base = ev_base;
map->r = resolver;
map->active_http = active_http;

if (active_http) {
map->active_http = active_http;
}

rspamd_map_schedule_periodic (map, FALSE, TRUE, FALSE);


+ 1
- 0
src/libutil/map_private.h Ver arquivo

@@ -20,6 +20,7 @@
#include "mem_pool.h"
#include "keypair.h"
#include "unix-std.h"
#include "map.h"
#include "ref.h"

typedef void (*rspamd_map_dtor) (gpointer p);

Carregando…
Cancelar
Salvar