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 2015/04/09 21:20:15 UTC
svn commit: r1672466 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c
Author: rjung
Date: Thu Apr 9 19:20:14 2015
New Revision: 1672466
URL: http://svn.apache.org/r1672466
Log:
Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1672466&r1=1672465&r2=1672466&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Apr 9 19:20:14 2015
@@ -2745,7 +2745,7 @@ static int proxy_status_hook(request_rec
}
else {
ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Name: %s\n",
- i, n, balancer->s->name);
+ i, n, (*worker)->s->name);
ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Status: %s\n",
i, n, ap_proxy_parse_wstatus(r->pool, *worker));
ap_rprintf(r, "ProxyBalancer[%d]Worker[%d]Elected: %"
@@ -2763,19 +2763,21 @@ static int proxy_status_hook(request_rec
ap_rputs("</table>\n", r);
++balancer;
}
- ap_rputs("<hr /><table>\n"
- "<tr><th>SSes</th><td>Sticky session name</td></tr>\n"
- "<tr><th>Timeout</th><td>Balancer Timeout</td></tr>\n"
- "<tr><th>Sch</th><td>Connection scheme</td></tr>\n"
- "<tr><th>Host</th><td>Backend Hostname</td></tr>\n"
- "<tr><th>Stat</th><td>Worker status</td></tr>\n"
- "<tr><th>Route</th><td>Session Route</td></tr>\n"
- "<tr><th>Redir</th><td>Session Route Redirection</td></tr>\n"
- "<tr><th>F</th><td>Load Balancer Factor</td></tr>\n"
- "<tr><th>Acc</th><td>Number of uses</td></tr>\n"
- "<tr><th>Wr</th><td>Number of bytes transferred</td></tr>\n"
- "<tr><th>Rd</th><td>Number of bytes read</td></tr>\n"
- "</table>", r);
+ if (!(flags & AP_STATUS_SHORT)) {
+ ap_rputs("<hr /><table>\n"
+ "<tr><th>SSes</th><td>Sticky session name</td></tr>\n"
+ "<tr><th>Timeout</th><td>Balancer Timeout</td></tr>\n"
+ "<tr><th>Sch</th><td>Connection scheme</td></tr>\n"
+ "<tr><th>Host</th><td>Backend Hostname</td></tr>\n"
+ "<tr><th>Stat</th><td>Worker status</td></tr>\n"
+ "<tr><th>Route</th><td>Session Route</td></tr>\n"
+ "<tr><th>Redir</th><td>Session Route Redirection</td></tr>\n"
+ "<tr><th>F</th><td>Load Balancer Factor</td></tr>\n"
+ "<tr><th>Acc</th><td>Number of uses</td></tr>\n"
+ "<tr><th>Wr</th><td>Number of bytes transferred</td></tr>\n"
+ "<tr><th>Rd</th><td>Number of bytes read</td></tr>\n"
+ "</table>", r);
+ }
return OK;
}