Browse Source

[Fix] Fix reload in some plugins and workers

tags/1.3.4
Vsevolod Stakhov 7 years ago
parent
commit
49c4849dac
3 changed files with 12 additions and 2 deletions
  1. 1
    0
      src/hs_helper.c
  2. 9
    2
      src/plugins/dkim_check.c
  3. 2
    0
      src/plugins/fuzzy_check.c

+ 1
- 0
src/hs_helper.c View File

@@ -267,6 +267,7 @@ start_hs_helper (struct rspamd_worker *worker)
struct timeval tv;
double tim;

ctx->cfg = worker->srv->cfg;

if (ctx->hs_dir == NULL) {
ctx->hs_dir = ctx->cfg->hs_cache_dir;

+ 9
- 2
src/plugins/dkim_check.c View File

@@ -107,7 +107,7 @@ dkim_module_init (struct rspamd_config *cfg, struct module_ctx **ctx)
{
dkim_module_ctx = g_malloc0 (sizeof (struct dkim_ctx));

dkim_module_ctx->dkim_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
dkim_module_ctx->dkim_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), "dkim");
dkim_module_ctx->sign_headers = "from:sender:reply-to:subject:date:message-id:"
"to:cc:mime-version:content-type:content-transfer-encoding:"
"resent-to:resent-cc:resent-from:resent-sender:resent-message-id:"
@@ -470,7 +470,14 @@ dkim_module_reconfig (struct rspamd_config *cfg)

memset (dkim_module_ctx, 0, sizeof (*dkim_module_ctx));
dkim_module_ctx->ctx = saved_ctx;
dkim_module_ctx->dkim_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
dkim_module_ctx->dkim_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), "dkim");
dkim_module_ctx->sign_headers = "from:sender:reply-to:subject:date:message-id:"
"to:cc:mime-version:content-type:content-transfer-encoding:"
"resent-to:resent-cc:resent-from:resent-sender:resent-message-id:"
"in-reply-to:references:list-id:list-owner:list-unsubscribe:"
"list-subscribe:list-post";
dkim_module_ctx->sign_condition_ref = -1;
dkim_module_ctx->max_sigs = DEFAULT_MAX_SIGS;

return dkim_module_config (cfg);
}

+ 2
- 0
src/plugins/fuzzy_check.c View File

@@ -978,10 +978,12 @@ fuzzy_check_module_reconfig (struct rspamd_config *cfg)

saved_ctx = fuzzy_module_ctx->ctx;
rspamd_mempool_delete (fuzzy_module_ctx->fuzzy_pool);
rspamd_keypair_cache_destroy (fuzzy_module_ctx->keypairs_cache);
memset (fuzzy_module_ctx, 0, sizeof (*fuzzy_module_ctx));
fuzzy_module_ctx->ctx = saved_ctx;
fuzzy_module_ctx->fuzzy_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
fuzzy_module_ctx->cfg = cfg;
fuzzy_module_ctx->keypairs_cache = rspamd_keypair_cache_new (32);

return fuzzy_check_module_config (cfg);
}

Loading…
Cancel
Save