Commit e78a15ac authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 4ac0179f
Loading
Loading
Loading
Loading
+6 −1
Changes for modules/proxy/mod_proxy_balancer.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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;
            }