From: willy tarreau <willy@wtap.(none)>
Date: Sat, 13 May 2006 16:37:04 +0000 (+0200)
Subject: [MINOR] the queue time was missing from TCP logs.
X-Git-Tag: v1.2.13~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f15c5517afef8c9e9f3ded24b3997742be1d5f5;p=thirdparty%2Fhaproxy.git

[MINOR] the queue time was missing from TCP logs.
---

diff --git a/haproxy.c b/haproxy.c
index 8bec84b063..cc317b7bce 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -3000,7 +3000,7 @@ void sess_log(struct session *s) {
 		 s->logs.srv_queue_size, s->logs.prx_queue_size, tmpline);
     }
     else {
-	send_log(p, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d] %s %s %d/%s%d %s%lld %c%c %d/%d/%d %d/%d\n",
+	send_log(p, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d] %s %s %d/%d/%s%d %s%lld %c%c %d/%d/%d %d/%d\n",
 		 pn,
 		 (s->cli_addr.ss_family == AF_INET) ?
 		   ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
@@ -3008,7 +3008,8 @@ void sess_log(struct session *s) {
 		 tm->tm_mday, monthname[tm->tm_mon], tm->tm_year+1900,
 		 tm->tm_hour, tm->tm_min, tm->tm_sec,
 		 pxid, srv,
-		 (s->logs.t_connect >= 0) ? s->logs.t_connect : -1,
+		 (s->logs.t_queue >= 0) ? s->logs.t_queue : -1,
+		 (s->logs.t_connect >= 0) ? s->logs.t_connect - s->logs.t_queue : -1,
 		 (p->to_log & LW_BYTES) ? "" : "+", s->logs.t_close,
 		 (p->to_log & LW_BYTES) ? "" : "+", s->logs.bytes,
 		 sess_term_cond[(s->flags & SN_ERR_MASK) >> SN_ERR_SHIFT],