From: Willy Tarreau <w@1wt.eu>
Date: Wed, 7 Sep 2011 16:41:08 +0000 (+0200)
Subject: [BUG] peers: the peer frontend must not emit any log
X-Git-Tag: v1.5-dev8~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b249e8454cf3cf5f81dfdcbe06b0dcef3519aef1;p=thirdparty%2Fhaproxy.git

[BUG] peers: the peer frontend must not emit any log

Peers' frontends must have logging disabled by default, which was not
the case, so logs were randomly emitted upon restart, sometimes causing
a new process to fail to replace the old one.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 45d9677d8c..f63c615419 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1040,7 +1040,6 @@ void init_default_instance()
 	defproxy.state = PR_STNEW;
 	defproxy.maxconn = cfg_maxpconn;
 	defproxy.conn_retries = CONN_RETRIES;
-	defproxy.logfac1 = defproxy.logfac2 = -1; /* log disabled */
 
 	defproxy.defsrv.inter = DEF_CHKINTR;
 	defproxy.defsrv.fastinter = 0;
diff --git a/src/proxy.c b/src/proxy.c
index 9409d55430..7bbc6a7c9d 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -415,7 +415,7 @@ int proxy_cfg_ensure_no_http(struct proxy *curproxy)
 
 /* Perform the most basic initialization of a proxy :
  * memset(), list_init(*), reset_timeouts(*).
- * Any new proxy should be initialized via this function.
+ * Any new proxy or peer should be initialized via this function.
  */
 void init_new_proxy(struct proxy *p)
 {
@@ -440,6 +440,7 @@ void init_new_proxy(struct proxy *p)
 	/* Timeouts are defined as -1 */
 	proxy_reset_timeouts(p);
 	p->tcp_rep.inspect_delay = TICK_ETERNITY;
+	p->logfac1 = p->logfac2 = -1; /* log disabled */
 }
 
 /*