Commit 80372dcc authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent 62d8b4ad

CHANGES

+2 −2
Original line number Diff line number Diff line
@@ -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.

STATUS

+0 −10
Original line number Diff line number Diff line
@@ -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.

modules/proxy/mod_proxy.c

+4 −2
Original line number Diff line number Diff line
@@ -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);