From: Jim Jagielski Date: Thu, 13 Jan 2011 23:25:48 +0000 (+0000) Subject: Display number of members possible per balancer X-Git-Tag: 2.3.11~213 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=283b511ebd22e090eee54b56a397c3a748c5f369;p=thirdparty%2Fapache%2Fhttpd.git Display number of members possible per balancer git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058795 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index 884c1e8ea96..7b26ce12c76 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -950,24 +950,25 @@ static int balancer_handler(request_rec *r) ap_rputs("
\n

LoadBalancer Status for ", r); ap_rvputs(r, balancer->name, "

\n\n", NULL); ap_rputs("\n\n" - "" + "" "\n", r); + ap_rprintf(r, "\n", balancer->max_workers); if (balancer->sticky) { if (strcmp(balancer->sticky, balancer->sticky_path)) { - ap_rvputs(r, "", + ap_rprintf(r, "", apr_time_sec(balancer->timeout)); - ap_rprintf(r, "\n", balancer->max_attempts); - ap_rprintf(r, "\n", + ap_rprintf(r, "\n", balancer->max_attempts); + ap_rprintf(r, "\n", balancer->lbmethod->name); ap_rputs("
StickySessionTimeoutFailoverAttemptsMethodMaxMembersStickySessionTimeoutFailoverAttemptsMethod
%d", balancer->sticky, " | ", + ap_rvputs(r, "", balancer->sticky, " | ", balancer->sticky_path, NULL); } else { - ap_rvputs(r, "", balancer->sticky, NULL); + ap_rvputs(r, "", balancer->sticky, NULL); } } else { - ap_rputs(" - ", r); + ap_rputs(" - ", r); } - ap_rprintf(r, "%" APR_TIME_T_FMT "%" APR_TIME_T_FMT "%d%s%d%s
\n
", r); ap_rputs("\n\n" @@ -987,12 +988,12 @@ static int balancer_handler(request_rec *r) "&nonce=", balancer->nonce, "\">", NULL); ap_rvputs(r, worker->s->name, "", NULL); - ap_rvputs(r, "", worker->s->lbfactor); - ap_rprintf(r, "", worker->s->lbfactor); + ap_rprintf(r, "", r); - ap_rprintf(r, "\n", r);
", ap_escape_html(r->pool, worker->s->route), + ap_rvputs(r, "", ap_escape_html(r->pool, worker->s->route), NULL); - ap_rvputs(r, "", + ap_rvputs(r, "", ap_escape_html(r->pool, worker->s->redirect), NULL); - ap_rprintf(r, "%d%d", worker->s->lbset); + ap_rprintf(r, "%d%d", worker->s->lbset); if (worker->s->status & PROXY_WORKER_DISABLED) ap_rputs("Dis ", r); if (worker->s->status & PROXY_WORKER_IN_ERROR) @@ -1006,9 +1007,9 @@ static int balancer_handler(request_rec *r) if (!PROXY_WORKER_IS_INITIALIZED(worker)) ap_rputs("-", r); ap_rputs("%" APR_SIZE_T_FMT "", worker->s->elected); + ap_rprintf(r, "%" APR_SIZE_T_FMT "", worker->s->elected); ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r); - ap_rputs("", r); + ap_rputs("", r); ap_rputs(apr_strfsize(worker->s->read, fbuf), r); ap_rputs("