httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1799485 - /httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
Date Wed, 21 Jun 2017 16:29:54 GMT
Author: jim
Date: Wed Jun 21 16:29:54 2017
New Revision: 1799485

URL: http://svn.apache.org/viewvc?rev=1799485&view=rev
Log:
OK... we display ms, since we want to be able to provide
values for <1sec, so entries should assume ms input when
using bal-mgr


Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1799485&r1=1799484&r2=1799485&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Wed Jun 21 16:29:54 2017
@@ -1142,7 +1142,7 @@ static int balancer_handler(request_rec
         }
         if ((val = apr_table_get(params, "w_hi"))) {
             apr_interval_time_t hci;
-            if (ap_timeout_parameter_parse(val, &hci, "s") == APR_SUCCESS) {
+            if (ap_timeout_parameter_parse(val, &hci, "ms") == APR_SUCCESS) {
                 if (hci >= AP_WD_TM_SLICE) {
                     wsel->s->interval = hci;
                 }
@@ -1615,7 +1615,7 @@ static int balancer_handler(request_rec
                 ap_rputs(apr_strfsize(worker->s->read, fbuf), r);
                 if (set_worker_hc_param_f) {
                     ap_rprintf(r, "</td><td>%s</td>", ap_proxy_show_hcmethod(worker->s->method));
-                    ap_rprintf(r, "<td>%d</td>", (int)apr_time_sec(worker->s->interval));
+                    ap_rprintf(r, "<td>%dms</td>", (int)apr_time_msec(worker->s->interval));
                     ap_rprintf(r, "<td>%d (%d)</td>", worker->s->passes,worker->s->pcount);
                     ap_rprintf(r, "<td>%d (%d)</td>", worker->s->fails,
worker->s->fcount);
                     ap_rprintf(r, "<td>%s</td>", worker->s->hcuri);
@@ -1684,8 +1684,8 @@ static int balancer_handler(request_rec
                 ap_rputs("<tr><td>Expr</td><td><select name='w_he'>\n",
r);
                 hc_select_exprs_f(r, wsel->s->hcexpr);
                 ap_rputs("</select>\n</td></tr>\n", r);
-                ap_rprintf(r, "<tr><td>Interval (secs)</td><td><input
name='w_hi' id='w_hi' type='text'"
-                           "value='%d'></td></tr>\n", (int)apr_time_sec(wsel->s->interval));
+                ap_rprintf(r, "<tr><td>Interval (ms)</td><td><input
name='w_hi' id='w_hi' type='text'"
+                           "value='%d'></td></tr>\n", (int)apr_time_msec(wsel->s->interval));
                 ap_rprintf(r, "<tr><td>Passes trigger</td><td><input
name='w_hp' id='w_hp' type='text'"
                            "value='%d'></td></tr>\n", wsel->s->passes);
                 ap_rprintf(r, "<tr><td>Fails trigger)</td><td><input
name='w_hf' id='w_hf' type='text'"



Mime
View raw message