You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2018/08/07 10:17:33 UTC
svn commit: r1837588 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy.c
Author: rjung
Date: Tue Aug 7 10:17:33 2018
New Revision: 1837588
URL: http://svn.apache.org/viewvc?rev=1837588&view=rev
Log:
mod_proxy: Improve the balancer member data shown
in mod_status when "ProxyStatus" is "On":
add "busy" count and show byte counts in auto
mode always in units of kilobytes.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1837588&r1=1837587&r2=1837588&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Aug 7 10:17:33 2018
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.1
+ *) mod_proxy: Improve the balancer member data shown in mod_status when
+ "ProxyStatus" is "On": add "busy" count and show byte counts in auto
+ mode always in units of kilobytes. [Rainer Jung]
+
*) mod_proxy: If ProxyPassReverse is used for reverse mapping of relative
redirects, subsequent ProxyPassReverse statements, whether they are
relative or absolute, may fail. PR 60408. [Peter Haworth <pmh1wheel gmail.com>]
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1837588&r1=1837587&r2=1837588&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Tue Aug 7 10:17:33 2018
@@ -2876,7 +2876,7 @@ static int proxy_status_hook(request_rec
ap_rputs("\n\n<table border=\"0\"><tr>"
"<th>Sch</th><th>Host</th><th>Stat</th>"
"<th>Route</th><th>Redir</th>"
- "<th>F</th><th>Set</th><th>Acc</th><th>Wr</th><th>Rd</th>"
+ "<th>F</th><th>Set</th><th>Acc</th><th>Busy</th><th>Wr</th><th>Rd</th>"
"</tr>\n", r);
}
else {
@@ -2894,8 +2894,10 @@ static int proxy_status_hook(request_rec
ap_rvputs(r, "</td><td>", (*worker)->s->redirect, NULL);
ap_rprintf(r, "</td><td>%.2f</td>", (float)((*worker)->s->lbfactor)/100.0);
ap_rprintf(r, "<td>%d</td>", (*worker)->s->lbset);
- ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td><td>",
+ ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>",
(*worker)->s->elected);
+ ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td><td>",
+ (*worker)->s->busy);
ap_rputs(apr_strfsize((*worker)->s->transferred, fbuf), r);
ap_rputs("</td><td>", r);
ap_rputs(apr_strfsize((*worker)->s->read, fbuf), r);
@@ -2912,10 +2914,16 @@ static int proxy_status_hook(request_rec
ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Elected: %"
APR_SIZE_T_FMT "\n",
i, n, (*worker)->s->elected);
- ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Sent: %s\n",
- i, n, apr_strfsize((*worker)->s->transferred, fbuf));
- ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Rcvd: %s\n",
- i, n, apr_strfsize((*worker)->s->read, fbuf));
+ ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Busy: %"
+ APR_SIZE_T_FMT "\n",
+ i, n, (*worker)->s->busy);
+ ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Sent: %"
+ APR_OFF_T_FMT "K\n",
+ i, n, (*worker)->s->transferred >> 10);
+ ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Rcvd: %"
+ APR_OFF_T_FMT "K\n",
+ i, n, (*worker)->s->read >> 10);
+
/* TODO: Add the rest of dynamic worker data */
}