pero 2005/07/01 09:47:11
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java LocalStrings.properties
Log:
Fix docs at register message to container host or engine
Revision Changes Path
1.49 +13 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Index: DeltaManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- DeltaManager.java 26 Jun 2005 21:21:49 -0000 1.48
+++ DeltaManager.java 1 Jul 2005 16:47:10 -0000 1.49
@@ -919,7 +919,7 @@
if(engine != null && engine instanceof Engine) {
cluster = engine.getCluster();
if(cluster != null && cluster instanceof
CatalinaCluster) {
- setCluster((CatalinaCluster) cluster) ;
+ setCluster((CatalinaCluster)
cluster) ;
}
} else {
cluster = null ;
@@ -931,6 +931,17 @@
if (cluster == null) {
log.error(sm.getString("deltaManager.noCluster", getName()));
return;
+ } else {
+ if (log.isInfoEnabled()) {
+ String type = "unknown" ;
+ if( cluster.getContainer() instanceof Host){
+ type = "Host" ;
+ } else if( cluster.getContainer() instanceof Engine){
+ type = "Engine" ;
+ }
+ log.info(sm
+ .getString("deltaManager.registerCluster",
getName(), type, cluster.getClusterName()));
+ }
}
if (log.isInfoEnabled())
log.info(sm
1.10 +1 -0
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LocalStrings.properties 26 Jun 2005 21:21:49 -0000 1.9
+++ LocalStrings.properties 1 Jul 2005 16:47:10 -0000 1.10
@@ -34,6 +34,7 @@
deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session state
deserialized
deltaManager.receiveMessage.allSessionDataBegin=Manager [{0}]: received
session state data
deltaManager.receiveMessage.fromWrongDomain=Manager [{0}]: Received wrong
SessionMessage of type=({1}) from [{2}] with domain [{3}] (localdomain [{4}]
+deltaManager.registerCluster=Register manager {0} to cluster element {1}
with name {2}
deltaManager.sessionReceived=Manager [{0}]; session state send at {1}
received in {2} ms.
deltaManager.sessionTimeout=Invalid session timeout setting {0}
deltaManager.startClustering=Starting clustering manager at {0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
