From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 4 Oct 2019 13:17:50 +0000 (+0100)
Subject: [Minor] Do not refork on heartbeat loss if it has not been configured
X-Git-Tag: 2.0~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef230d1655049e25565b8827f7551a25b13c6293;p=thirdparty%2Frspamd.git

[Minor] Do not refork on heartbeat loss if it has not been configured
---

diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index eff39a8b07..1e03e69761 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -1362,7 +1362,8 @@ rspamd_check_termination_clause (struct rspamd_main *rspamd_main,
 	if (WIFEXITED (res) && WEXITSTATUS (res) == 0) {
 		/* Normal worker termination, do not fork one more */
 
-		if (wrk->hb.nbeats < 0) {
+		if (wrk->hb.nbeats < 0 && rspamd_main->cfg->heartbeats_loss_max > 0 &&
+		        -(wrk->hb.nbeats) >= rspamd_main->cfg->heartbeats_loss_max) {
 			msg_info_main ("%s process %P terminated normally, but lost %L "
 				  "heartbeats, refork it",
 					g_quark_to_string (wrk->type),