From: willy tarreau <willy@wtap.(none)>
Date: Sun, 18 Dec 2005 00:25:24 +0000 (+0100)
Subject: * released 1.2.6-pre5 (1.1.32)
X-Git-Tag: v1.2.6-pre5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fe396592dcfca87ceaccbff4f9247895e623fb3;p=thirdparty%2Fhaproxy.git

* released 1.2.6-pre5 (1.1.32)
* added the number of active sessions (proxy/process) in the logs
---

diff --git a/CHANGELOG b/CHANGELOG
index 540c780e00..2b8116efcc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@ ChangeLog :
 ===========
 
 2005/07/06 : 1.2.6 (1.1.32)
+  - added the number of active sessions (proxy/process) in the logs
+
+2005/07/06 : 1.2.6-pre4 (1.1.32-pre4)
   - the time-out fix introduced in 1.1.25 caused a corner case where it was
     possible for a client to keep a connection maintained regardless of the
     timeout if the server closed the connection during the HEADER phase,
diff --git a/haproxy.c b/haproxy.c
index 9f955be118..899417780c 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -2385,7 +2385,7 @@ void sess_log(struct session *s) {
 	}
 	*h = '\0';
 
-	send_log(p, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d] %s %s %d/%d/%d/%s%d %d %s%lld %s %s %c%c%c%c%s\n",
+	send_log(p, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d] %s %s %d/%d/%d/%s%d %d %s%lld %s %s %c%c%c%c %d/%d%s\n",
 		 pn,
 		 (s->cli_addr.ss_family == AF_INET) ?
 		   ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
@@ -2405,10 +2405,10 @@ void sess_log(struct session *s) {
 		 sess_fin_state[(s->flags & SN_FINST_MASK) >> SN_FINST_SHIFT],
 		 (p->options & PR_O_COOK_ANY) ? sess_cookie[(s->flags & SN_CK_MASK) >> SN_CK_SHIFT] : '-',
 		 (p->options & PR_O_COOK_ANY) ? sess_set_cookie[(s->flags & SN_SCK_MASK) >> SN_SCK_SHIFT] : '-',
-		 tmpline);
+		 p->nbconn, actconn, tmpline);
     }
     else {
-	send_log(p, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d] %s %s %d/%s%d %s%lld %c%c\n",
+	send_log(p, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d] %s %s %d/%s%d %s%lld %c%c %d/%d\n",
 		 pn,
 		 (s->cli_addr.ss_family == AF_INET) ?
 		   ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
@@ -2420,7 +2420,8 @@ void sess_log(struct session *s) {
 		 (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],
-		 sess_fin_state[(s->flags & SN_FINST_MASK) >> SN_FINST_SHIFT]);
+		 sess_fin_state[(s->flags & SN_FINST_MASK) >> SN_FINST_SHIFT],
+		 p->nbconn, actconn);
     }
 
     s->logs.logwait = 0;