]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Minor] Initialize composite policy when defined from Lua
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 30 Jul 2018 12:11:10 +0000 (13:11 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 30 Jul 2018 12:11:10 +0000 (13:11 +0100)
src/fuzzy_storage.c
src/lua/lua_config.c

index f248d928fdbe4c72e0298b420a283d54f24c377c..cd02668442e8f2c0eedd44ffeb4d18feaa05fd23 100644 (file)
@@ -550,8 +550,8 @@ rspamd_fuzzy_updates_cb (gboolean success,
                }
 
                msg_info ("successfully updated fuzzy storage: %d updates in queue; "
-                       "%d pending currently; "
-                       "%d added, %d deleted, %d extended, %d duplicates",
+                                 "%d pending currently; "
+                                 "%d added, %d deleted, %d extended, %d duplicates",
                                cbdata->updates_pending->len,
                                ctx->updates_pending->len,
                                nadded, ndeleted, nextended, nignored);
@@ -562,7 +562,7 @@ rspamd_fuzzy_updates_cb (gboolean success,
        else {
                if (++ctx->updates_failed > ctx->updates_maxfail) {
                        msg_err ("cannot commit update transaction to fuzzy backend, discard "
-                                       "%ud updates after %d retries",
+                                        "%ud updates after %d retries",
                                        cbdata->updates_pending->len,
                                        ctx->updates_maxfail);
                        ctx->updates_failed = 0;
@@ -609,7 +609,7 @@ rspamd_fuzzy_process_updates_queue (struct rspamd_fuzzy_storage_ctx *ctx,
                cbdata->updates_pending = ctx->updates_pending;
                ctx->updates_pending = g_array_sized_new (FALSE, FALSE,
                                sizeof (struct fuzzy_peer_cmd),
-                               MAX (ctx->updates_pending->len, 1024));
+                               MAX (cbdata->updates_pending->len, 1024));
                cbdata->source = g_strdup (source);
                rspamd_fuzzy_backend_process_updates (ctx->backend,
                                cbdata->updates_pending,
index 35b7dc3323f406800266fef772060749fc607fad..41e323753f5157a22af5304d82248fc6202fe2d9 100644 (file)
@@ -2272,7 +2272,8 @@ lua_config_add_composite (lua_State * L)
                                        msg_warn_config ("composite %s is redefined", name);
                                        new = FALSE;
                                }
-                               composite = rspamd_mempool_alloc (cfg->cfg_pool,
+
+                               composite = rspamd_mempool_alloc0 (cfg->cfg_pool,
                                                sizeof (struct rspamd_composite));
                                composite->expr = expr;
                                composite->id = g_hash_table_size (cfg->composite_symbols);