tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r673487 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaManager.java java/org/apache/catalina/ha/session/LocalStrings.properties webapps/docs/config/cluster-manager.xml
Date Wed, 02 Jul 2008 20:41:10 GMT
Author: fhanik
Date: Wed Jul  2 13:41:10 2008
New Revision: 673487

URL: http://svn.apache.org/viewvc?rev=673487&view=rev
Log:
Fix for bug 45317, document and properly output the session timeout time

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
    tomcat/trunk/webapps/docs/config/cluster-manager.xml

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=673487&r1=673486&r2=673487&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Jul  2 13:41:10
2008
@@ -880,7 +880,7 @@
                      receiverQueue = true ;
                 }
                 cluster.send(msg, mbr);
-                if (log.isWarnEnabled()) log.warn(sm.getString("deltaManager.waitForSessionState",getName(),
mbr));
+                if (log.isWarnEnabled()) log.warn(sm.getString("deltaManager.waitForSessionState",getName(),
mbr,getStateTransferTimeout()));
                 // FIXME At sender ack mode this method check only the state transfer and
resend is a problem!
                 waitForSendAllSessions(beforeSendTime);
             } finally {

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=673487&r1=673486&r2=673487&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties Wed Jul  2 13:41:10
2008
@@ -55,7 +55,7 @@
 deltaManager.startClustering=Starting clustering manager at {0}
 deltaManager.stopped=Manager [{0}] is stopping
 deltaManager.unloading.ioe=IOException while saving persisted sessions: {0}
-deltaManager.waitForSessionState=Manager [{0}], requesting session state from {1}. This operation
will timeout if no session state has been received within 60 seconds.
+deltaManager.waitForSessionState=Manager [{0}], requesting session state from {1}. This operation
will timeout if no session state has been received within {2} seconds.
 deltaRequest.showPrincipal=Principal [{0}] is set to session {1}
 deltaRequest.wrongPrincipalClass=DeltaManager only support GenericPrincipal. Your realm used
principal class {0}.
 deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId [{1}]

Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=673487&r1=673486&r2=673487&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Wed Jul  2 13:41:10 2008
@@ -97,6 +97,11 @@
        a shutdown occurs on one node, set this value to <code>true</code>.
        Default value is <code>false</code>.
      </attribute>
+     <attribute name="stateTransferTimeout" required="false">
+       The time in seconds to wait for a session state transfer to complete from another
node
+       when a node is starting up.
+       Default value is <code>60</code> seconds.
+     </attribute>
     </attributes>
   </subsection>
   <subsection name="org.apache.catalina.ha.session.BackupManager Attributes">



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


Mime
View raw message