[PATCH 1/4] mailer: increase default timeout to 10 seconds this allows the TCP connection to retry connecting when a packet is lost on the network (no replies)

From 4583d6c5a96413bc6b827863b2be8e0c5b68910b Mon Sep 17 00:00:00 2001
From: Pieter Baauw <piba.nl.dev@gmail.com>
Date: Fri, 12 Feb 2016 14:35:20 +0100
Subject: [PATCH 1/4] mailer: increase default timeout to 10 seconds this
allows the TCP connection to retry connecting when a packet is lost on the
network

---
include/common/defaults.h | 1 +
src/checks.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/common/defaults.h b/include/common/defaults.h
index d1994e8..1c971d9 100644
--- a/include/common/defaults.h
+++ b/include/common/defaults.h
@@ -146,6 +146,7 @@

#define CHK_CONNTIME 2000
#define DEF_CHKINTR 2000
+#define DEF_MAILALERTTIME 10000
#define DEF_FALLTIME 3
#define DEF_RISETIME 2
#define DEF_AGENT_FALLTIME 1
diff --git a/src/checks.c b/src/checks.c
index bc7eaa7..9d6d33e 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -3108,7 +3108,7 @@ static int init_email_alert_checks(struct server *s)

LIST_INIT(&q->email_alerts);

- check->inter = DEF_CHKINTR; /* XXX: Would like to Skip to the next alert, if any, ASAP.
+ check->inter = DEF_MAILALERTTIME; /* XXX: Would like to Skip to the next alert, if any, ASAP.
* But need enough time so that timeouts don't occur
* during tcp check procssing. For now just us an arbitrary default. */
check->rise = DEF_AGENT_RISETIME;
--
2.7.0.windows.1