From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 19 Jul 2017 20:15:05 +0000 (+0100)
Subject: [Minor] Add some sanity checks when managing monitoring timeouts
X-Git-Tag: 1.6.3~1^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4146bb402c0068961fb3416cf8e05c79f7f0c31a;p=thirdparty%2Frspamd.git

[Minor] Add some sanity checks when managing monitoring timeouts
---

diff --git a/src/libserver/monitored.c b/src/libserver/monitored.c
index 9ee4a228bd..cc11183b2a 100644
--- a/src/libserver/monitored.c
+++ b/src/libserver/monitored.c
@@ -94,7 +94,11 @@ rspamd_monitored_propagate_error (struct rspamd_monitored *m,
 			m->cur_errors ++;
 			/* Reduce timeout */
 			rspamd_monitored_stop (m);
-			m->monitoring_mult /= 2.0;
+
+			if (m->monitoring_mult > 0.1) {
+				m->monitoring_mult /= 2.0;
+			}
+
 			rspamd_monitored_start (m);
 		}
 		else {
@@ -132,6 +136,7 @@ rspamd_monitored_propagate_success (struct rspamd_monitored *m, gdouble lat)
 	gdouble t;
 
 	m->cur_errors = 0;
+	m->monitoring_mult = 1.0;
 
 	if (!m->alive) {
 		t = rspamd_get_calendar_ticks ();
@@ -144,7 +149,6 @@ rspamd_monitored_propagate_success (struct rspamd_monitored *m, gdouble lat)
 		m->nchecks = 1;
 		m->latency = lat;
 		rspamd_monitored_stop (m);
-		m->monitoring_mult = 1.0;
 		rspamd_monitored_start (m);
 
 		if (m->ctx->change_cb) {