Author: rjung
Date: Sun Sep 3 11:00:44 2006
New Revision: 439813
URL: http://svn.apache.org/viewvc?view=rev&rev=439813
Log:
Adjust recover time output with respect
to next global maintenance.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=439813&r1=439812&r2=439813
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Sep 3 11:00:44
2006
@@ -473,24 +473,25 @@
jk_putv(s, "<td>", status_strfsize(wr->s->readed, buf),
"</td>", NULL);
jk_printf(s, "<td>%u</td>", wr->s->busy);
- jk_printf(s, "<td>%u</td><td>", wr->s->max_busy);
+ jk_printf(s, "<td>%u</td>\n<td>", wr->s->max_busy);
if (wr->s->redirect && *wr->s->redirect)
jk_puts(s, wr->s->redirect);
else
jk_puts(s," ");
- jk_puts(s, "</td><td>\n");
+ jk_puts(s, "</td>\n<td>");
if (wr->s->domain && *wr->s->domain)
jk_puts(s, wr->s->domain);
else
jk_puts(s," ");
+ jk_puts(s, "</td>\n<td>");
if (wr->s->state == JK_LB_STATE_ERROR) {
- int rs = lb->s->recover_wait_time - (int)difftime(now,
wr->s->error_time);
- jk_printf(s, "</td>\n<td>%u", rs < 0 ? 0 : rs);
+ int rs = lb->maintain_time - (int)difftime(now,
lb->s->last_maintain_time);
+ if (rs < lb->s->recover_wait_time - (int)difftime(now,
wr->s->error_time))
+ rs += lb->maintain_time;
+ jk_printf(s, "%u", rs < 0 ? 0 : rs);
}
else
- jk_puts(s, "</td>\n<td>");
-
-
+ jk_puts(s, "-");
jk_puts(s, "</td>\n</tr>\n");
}
jk_puts(s, "</table><br/>\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
