commit 5f5b7d2c1db1fabe3d372b0080a8773147762ee7
author Krzysztof Piotr Oledzki <ole@ans.pl> Mon Jan 11 11:13:39 2010 +0100
committer Willy Tarreau <w@1wt.eu> Mon Jan 11 21:13:12 2010 +0100
tree 2ffd2278d9e42c011bd59ddfedee3df2c0d50281
parent b16a607997f09a4a88d9a74d3b56bfc55c08c288

[OPTIM] remove SSP_O_VIA and SSP_O_STATUS

There is a smarter way to do this, so both options are no longer
necessary.

src/checks.c

diff --git a/src/checks.c b/src/checks.c
index d61b6bb..5db5f9e 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -141,17 +141,14 @@
 		return analyze_statuses[HANA_STATUS_UNKNOWN].desc;
 }
 
-#define SSP_O_VIA	0x0001
 #define SSP_O_HCHK	0x0002
-#define SSP_O_STATUS	0x0004
 
 static void server_status_printf(struct chunk *msg, struct server *s, unsigned options, int xferred) {
 
-	if (options & SSP_O_VIA)
+	if (s->tracked)
 		chunk_printf(msg, " via %s/%s",
 			s->tracked->proxy->id, s->tracked->id);
 
-
 	if (options & SSP_O_HCHK) {
 		chunk_printf(msg, ", reason: %s", get_check_status_description(s->check_status));
 
@@ -173,7 +170,7 @@
 			chunk_printf(msg, ", check duration: %ldms", s->check_duration);
 	}
 
-	if (options & SSP_O_STATUS) {
+	if (xferred > 0) {
 		if (!(s->state & SRV_RUNNING))
         	        chunk_printf(msg, ". %d active and %d backup servers left.%s"
 				" %d sessions active, %d requeued, %d remaining in queue.\n",
@@ -387,7 +384,6 @@
 			s->proxy->id, s->id);
 
 		server_status_printf(&msg, s,
-					(s->tracked?SSP_O_VIA:0) | SSP_O_STATUS |
 					((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
 					xferred);
 
@@ -456,7 +452,6 @@
 			s->proxy->id, s->id);
 
 		server_status_printf(&msg, s,
-					(s->tracked?SSP_O_VIA:0) | SSP_O_STATUS |
 					((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
 					xferred);
 
@@ -496,7 +491,6 @@
 		s->proxy->id, s->id);
 
 	server_status_printf(&msg, s,
-				(s->tracked?SSP_O_VIA:0) | SSP_O_STATUS |
 				((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
 				xferred);
 
@@ -533,7 +527,6 @@
 		s->proxy->id, s->id);
 
 	server_status_printf(&msg, s,
-				(s->tracked?SSP_O_VIA:0) | SSP_O_STATUS |
 				((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
 				xferred);