[Fix] Fix reload in some plugins and workers

diff --git a/src/hs_helper.c b/src/hs_helper.c
index d2bcf891b2ee6ed7e00a124e1ed0d38d44a0b88d..2d391936272667b20e24579b70d24e3660d13350 100644 (file)
--- a/src/hs_helper.c
+++ b/src/hs_helper.c
@@ -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;

diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index 63a8832eb287d8d64428c276578852d5de72e596..76816561030e376813e705572cb9a11c9ecb7aff 100644 (file)
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -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);
 }

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 1ff219a5b549cb69a6d60830f9cdddfbbb896847..a619791f642b0f52fb390b9d1089d95ee3cb6db7 100644 (file)
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -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);
 }