svn commit: r420265 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[mt...@apache.org]

Author: mturk
Date: Sun Jul  9 02:09:22 2006
New Revision: 420265

URL: http://svn.apache.org/viewvc?rev=420265&view=rev
Log:
Make sure we use real worker retries instead one
that comes from service (loadbalancer). This enables
sticky-session to work without going to another
worker if lb retries are set to 1. The minimum number
of retries for worker should be 2.
The number 2 is enough for detecting broken socket and
one reconnect.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=420265&r1=420264&r2=420265&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sun Jul  9 02:09:22 2006
@@ -1694,13 +1694,15 @@
             return JK_CLIENT_ERROR;
         }
 
-        if (JK_IS_DEBUG_LEVEL(l))
-            jk_log(l, JK_LOG_DEBUG, "processing with %d retries", s->retries);
+        if (JK_IS_DEBUG_LEVEL(l)) {
+            jk_log(l, JK_LOG_DEBUG, "processing %s with %d retries",
+                   p->worker->name, p->worker->worker.retries);
+        }
         /*
          * JK_RETRIES could be replaced by the number of workers in
          * a load-balancing configuration
          */
-        for (i = 0; i < s->retries; i++) {
+        for (i = 0; i < p->worker->worker.retries; i++) {
             /*
              * We're using reqmsg which hold initial request
              * if Tomcat is stopped or restarted, we will pass reqmsg



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org