From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sat, 25 Jan 2025 14:25:27 +0000 (+0000)
Subject: [Minor] Really execute on_terminate scripts for fuzzy worker
X-Git-Tag: 3.11.1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18a31324393b0e6184be475c2fe604a3319bedf0;p=thirdparty%2Frspamd.git

[Minor] Really execute on_terminate scripts for fuzzy worker
---

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 1b20a208df..37d3f1ee1e 100644
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -61,7 +61,7 @@ worker_t fuzzy_worker = {
 	"fuzzy",     /* Name */
 	init_fuzzy,  /* Init function */
 	start_fuzzy, /* Start function */
-	RSPAMD_WORKER_HAS_SOCKET | RSPAMD_WORKER_NO_STRICT_CONFIG,
+	RSPAMD_WORKER_HAS_SOCKET | RSPAMD_WORKER_NO_STRICT_CONFIG | RSPAMD_WORKER_FUZZY,
 	RSPAMD_WORKER_SOCKET_UDP, /* UDP socket */
 	RSPAMD_WORKER_VER         /* Version info */
 };
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 39e70e4ca3..d0ac8d8d3a 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -167,7 +167,7 @@ static void
 rspamd_worker_terminate_handlers(struct rspamd_worker *w)
 {
 	if (w->nconns == 0 &&
-		(!(w->flags & RSPAMD_WORKER_SCANNER) || w->srv->cfg->on_term_scripts == NULL)) {
+		(!(w->flags & (RSPAMD_WORKER_SCANNER | RSPAMD_WORKER_FUZZY)) || w->srv->cfg->on_term_scripts == NULL)) {
 		/*
 		 * We are here either:
 		 * - No active connections are represented
@@ -190,7 +190,7 @@ rspamd_worker_terminate_handlers(struct rspamd_worker *w)
 			if (w->state != rspamd_worker_wait_final_scripts) {
 				w->state = rspamd_worker_wait_final_scripts;
 
-				if ((w->flags & (RSPAMD_WORKER_SCANNER|RSPAMD_WORKER_FUZZY)) &&
+				if ((w->flags & (RSPAMD_WORKER_SCANNER | RSPAMD_WORKER_FUZZY)) &&
 					rspamd_worker_call_finish_handlers(w)) {
 					msg_info("performing async finishing actions");
 					w->state = rspamd_worker_wait_final_scripts;