From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 4 Oct 2019 15:55:20 +0000 (+0100)
Subject: [Minor] Fix timer race in hs_helper
X-Git-Tag: 2.0~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9e7ea8b37bc8e45d21a5418b286bbed389c73cf;p=rspamd.git

[Minor] Fix timer race in hs_helper
---

diff --git a/src/hs_helper.c b/src/hs_helper.c
index d0fbb1cd9..cfcab33fd 100644
--- a/src/hs_helper.c
+++ b/src/hs_helper.c
@@ -200,6 +200,8 @@ rspamd_rs_delayed_cb (EV_P_ ev_timer *w, int revents)
 			ctx->event_loop, &srv_cmd, -1, NULL, NULL);
 	ev_timer_stop (EV_A_ w);
 	g_free (w);
+
+	ev_timer_again (EV_A_ &ctx->recompile_timer);
 }
 
 static void
@@ -286,6 +288,8 @@ rspamd_hs_helper_reload (struct rspamd_main *rspamd_main,
 				strerror (errno));
 	}
 
+	/* Stop recompile */
+	ev_timer_stop (ctx->event_loop, &ctx->recompile_timer);
 	rspamd_rs_compile (ctx, worker, TRUE);
 
 	return TRUE;
@@ -302,7 +306,6 @@ rspamd_hs_helper_timer (EV_P_ ev_timer *w, int revents)
 	tim = rspamd_time_jitter (ctx->recompile_time, 0);
 	w->repeat = tim;
 	rspamd_rs_compile (ctx, worker, FALSE);
-	ev_timer_again (EV_A_ w);
 }
 
 static void