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/31 19:09:50 UTC
svn commit: r1839784 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS
modules/proxy/mod_proxy.c
Author: rjung
Date: Fri Aug 31 19:09:50 2018
New Revision: 1839784
URL: http://svn.apache.org/viewvc?rev=1839784&view=rev
Log:
mod_proxy: Improve the balancer member data shown
in mod_status when "ProxyStatus" is "On":
add "busy" count to html mode.
Backport of remaining parts of r1837588 from trunk
(only html mode changes, auto parts were already
backported).
Submitted by: rjung
Reviewed by: rjung, jim, ylavic
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1839784&r1=1839783&r2=1839784&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Aug 31 19:09:50 2018
@@ -7,8 +7,8 @@ Changes with Apache 2.4.35
[Rainer Jung]
*) mod_proxy: Improve the balancer member data shown in mod_status when
- "ProxyStatus" is "On": add "busy" count to auto mode and show byte
- counts in auto mode always in units of kilobytes. [Rainer Jung]
+ "ProxyStatus" is "On": add "busy" count and show byte counts in
+ auto mode always in units of kilobytes. [Rainer Jung]
*) mod_status: Add cumulated response duration time in milliseconds
to auto mode.
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1839784&r1=1839783&r2=1839784&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Aug 31 19:09:50 2018
@@ -210,16 +210,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
2.4.x patch: https://home.apache.org/~jim/patches/response-204-304.patch
+1: jim, ylavic
- *) mod_proxy: Improve the balancer member data shown
- in mod_status when "ProxyStatus" is "On":
- add "busy" count to html mode. The auto mode part
- has already been backported.
- This changes the HTML output format for the proxy-status
- but adds the very important busy metric.
- trunk: http://svn.apache.org/r1837588 (remaining parts)
- 2.4.x patch: https://home.apache.org/~rjung/patches/httpd-2.4.x-proxy-status-html-busy-r1837588-part2.patch
- +1: rjung, jim, ylavic
-
*) mod_status: Add cumulated response duration time
in milliseconds to html mode. The auto mode part
has already been backported.
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c?rev=1839784&r1=1839783&r2=1839784&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c Fri Aug 31 19:09:50 2018
@@ -2835,7 +2835,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 {
@@ -2853,8 +2853,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);