From: Jim Jagielski <jim@apache.org>
Date: Wed, 30 Aug 2006 17:51:43 +0000 (+0000)
Subject: Merge r421287 from trunk:
X-Git-Tag: 2.2.4~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d87405df05dd9fa6d21f0cd3ca1633f17e8a05;p=thirdparty%2Fapache%2Fhttpd.git

Merge r421287 from trunk:

The number of times elected as well as the i/o
of the workers is useful info to show in the
manager.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438564 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index d06dad46034..e77ecb7bc59 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -664,6 +664,7 @@ static int balancer_handler(request_rec *r)
                 "<th>Worker URL</th>"
                 "<th>Route</th><th>RouteRedir</th>"
                 "<th>Factor</th><th>Status</th>"
+                "<th>Elected</th><th>To</th><th>From</th>"
                 "</tr>\n", r);
 
             worker = (proxy_worker *)balancer->workers->elts;
@@ -689,7 +690,11 @@ static int balancer_handler(request_rec *r)
                     ap_rputs("Ok", r);
                 if (!PROXY_WORKER_IS_INITIALIZED(worker))
                     ap_rputs("-", r);
-                ap_rputs("</td></tr>\n", r);
+                ap_rputs("</td>", r);
+                ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>", worker->s->elected);
+                ap_rprintf(r, "<td>%" APR_OFF_T_FMT "</td>", worker->s->transferred);
+                ap_rprintf(r, "<td>%" APR_OFF_T_FMT "</td>", worker->s->read);
+                ap_rputs("</tr>\n", r);
 
                 ++worker;
             }