Author: mturk
Date: Mon Oct 6 04:38:37 2008
New Revision: 702108
URL: http://svn.apache.org/viewvc?rev=702108&view=rev
Log:
Add retry_interval to lb as well
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?rev=702108&r1=702107&r2=702108&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Mon Oct 6 04:38:37
2008
@@ -75,6 +75,7 @@
#define JK_STATUS_ARG_OPTION_NO_AJP_CONF 0x0100
#define JK_STATUS_ARG_LB_RETRIES ("vlr")
+#define JK_STATUS_ARG_LB_RETRY_INT ("vlri")
#define JK_STATUS_ARG_LB_RECOVER_TIME ("vlt")
#define JK_STATUS_ARG_LB_MAX_REPLY_TIMEOUTS ("vlx")
#define JK_STATUS_ARG_LB_STICKY ("vls")
@@ -83,6 +84,7 @@
#define JK_STATUS_ARG_LB_LOCK ("vll")
#define JK_STATUS_ARG_LB_TEXT_RETRIES "Retries"
+#define JK_STATUS_ARG_LB_TEXT_RETRY_INT "Retry Interval"
#define JK_STATUS_ARG_LB_TEXT_RECOVER_TIME "Recover Wait Time"
#define JK_STATUS_ARG_LB_TEXT_MAX_REPLY_TIMEOUTS "Max Reply Timeouts"
#define JK_STATUS_ARG_LB_TEXT_STICKY "Sticky Sessions"
@@ -2499,6 +2501,10 @@
":</td><td><input name=\"",
JK_STATUS_ARG_LB_RETRIES, "\" type=\"text\" ", NULL);
jk_printf(s, "value=\"%d\"/></td></tr>\n", lb->retries);
+ jk_putv(s, "<tr><td>", JK_STATUS_ARG_LB_TEXT_RETRY_INT,
+ ":</td><td><input name=\"",
+ JK_STATUS_ARG_LB_RETRY_INT, "\" type=\"text\" ", NULL);
+ jk_printf(s, "value=\"%d\"/></td></tr>\n", lb->retry_interval);
jk_putv(s, "<tr><td>", JK_STATUS_ARG_LB_TEXT_RECOVER_TIME,
":</td><td><input name=\"",
JK_STATUS_ARG_LB_RECOVER_TIME, "\" type=\"text\" ", NULL);
@@ -2914,6 +2920,15 @@
lb->retries = i;
sync_needed = JK_TRUE;
}
+ i = status_get_int(p, JK_STATUS_ARG_LB_RETRY_INT,
+ lb->retry_interval, l);
+ if (i != lb->retry_interval && i > 0) {
+ jk_log(l, JK_LOG_INFO,
+ "Status worker '%s' setting 'retry_interval' for lb worker '%s'
to '%i'",
+ w->name, name, i);
+ lb->retry_interval = i;
+ sync_needed = JK_TRUE;
+ }
i = status_get_int(p, JK_STATUS_ARG_LB_RECOVER_TIME,
lb->recover_wait_time, l);
if (i != lb->recover_wait_time && i > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]