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.

Partial backport of r1837588 from trunk
(only auto mode changes, html parts not yet
backported).

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

diff --git a/CHANGES b/CHANGES
index a3011d5717b645a9bfdcbfae5d58fa8f58058358..998ce74d0f0389b541198230f0eae95b208f3ffd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Changes with Apache 2.4.35
      "c" and "s" values.
      [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]
+
   *) mod_status: Complete the data shown for async MPMs in "auto" mode.
      Added number of processes, number of stopping processes and number
      of busy and idle workers.  [Rainer Jung]

diff --git a/STATUS b/STATUS
index 352b931b5b7d510568c902a6f8051bd3abb9eea1..86ca4628f1d861dd5f83fdc7b41ba07e5c7a005c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -147,15 +147,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://people.apache.org/~covener/2.4.x-proxy-opt-fn.diff
       +1: covener, jim, ylavic
 
-   *) 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.
-      trunk: http://svn.apache.org/r1837588
-      2.4.x patch: svn merge -c 1837588 ^/httpd/httpd/trunk . 
-                   (adjust CHANGES)
-      +1: rjung, jim, ylavic
-
    *) mod_status: Add cumulated response duration time
       in milliseconds.
       trunk: http://svn.apache.org/r1837590

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 23364969191fad7598e7041fbf077b634cf071fd..d4a15a35002996fe93e9dcf25c8a7ad7c544632a 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2871,10 +2871,16 @@ static int proxy_status_hook(request_rec *r, int flags)
                 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 */
             }