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

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

diff --git a/CHANGES b/CHANGES
index ad354e08eb16964406d2508a450c162595e9046b..366091e57e83963f42984960612d30a7e99b126b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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.

diff --git a/STATUS b/STATUS
index 59332ad6fe0282795ffd8601003fcbbf413c41fe..71db044fb1c5d605cfccf577f3e6702be65c2010 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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.

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index d4a15a35002996fe93e9dcf25c8a7ad7c544632a..69a35cec3c3b6e55ec23a201a2c14ccf9b7b992b 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2835,7 +2835,7 @@ static int proxy_status_hook(request_rec *r, int flags)
             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 *r, int flags)
                 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);