mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 23:01:03 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: mailers: increase default timeout to 10 seconds

Browse Source 
This allows the tcp connection to send multiple SYN packets, so 1 lost
packet does not cause the mail to be lost. It changes the socket timeout
from 2 to 10 seconds, this allows for 3 syn packets to be send and
waiting a little for their reply.

This patch should be backported to 1.6.

Acked-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Pieter Baauw 2016-02-12 14:35:20 +01:00 committed by Willy Tarreau
parent 7a91a0e1e5
commit 46af170e41
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/defaults.h
View File

@ -146,6 +146,7 @@
#define CHK_CONNTIME 2000 #define CHK_CONNTIME 2000
#define DEF_CHKINTR 2000 #define DEF_CHKINTR 2000
#define DEF_MAILALERTTIME 10000
#define DEF_FALLTIME 3 #define DEF_FALLTIME 3
#define DEF_RISETIME 2 #define DEF_RISETIME 2
#define DEF_AGENT_FALLTIME 1 #define DEF_AGENT_FALLTIME 1

2
src/checks.c
View File

@ -3108,7 +3108,7 @@ static int init_email_alert_checks(struct server *s)
LIST_INIT(&q->email_alerts); 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 * But need enough time so that timeouts don't occur
* during tcp check procssing. For now just us an arbitrary default. */ * during tcp check procssing. For now just us an arbitrary default. */
check->rise = DEF_AGENT_RISETIME; check->rise = DEF_AGENT_RISETIME;