pero 2004/11/11 06:47:27
Modified: modules/cluster/src/share/org/apache/catalina/cluster
CatalinaCluster.java
modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastService.java McastServiceImpl.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java ReplicationValve.java
SimpleTcpCluster.java
Log:
add some missing getters
add some if(log.isXXXEnabled().
Revision Changes Path
1.9 +3 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java
Index: CatalinaCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CatalinaCluster.java 19 Oct 2004 22:30:50 -0000 1.8
+++ CatalinaCluster.java 11 Nov 2004 14:47:26 -0000 1.9
@@ -108,5 +108,7 @@
public Manager getManager(String name);
public void removeManager(String name);
public void addManager(String name, ClusterManager manager);
+ public Valve getValve();
+
}
1.13 +42 -19
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java
Index: McastService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- McastService.java 1 Jul 2004 09:44:26 -0000 1.12
+++ McastService.java 11 Nov 2004 14:47:26 -0000 1.13
@@ -111,24 +111,44 @@
properties.setProperty("mcastAddress", addr);
}
+ public String getMcastAddr() {
+ return properties.getProperty("mcastAddress");
+ }
+
public void setMcastBindAddress(String bindaddr) {
properties.setProperty("mcastBindAddress", bindaddr);
}
+ public String getMcastBindAddress() {
+ return properties.getProperty("mcastBindAddress");
+ }
+
public void setMcastPort(int port) {
properties.setProperty("mcastPort", String.valueOf(port));
}
+ public int getMcastPort() {
+ String p = properties.getProperty("mcastPort");
+ return new Integer(p).intValue();
+ }
+
public void setMcastFrequency(long time) {
properties.setProperty("msgFrequency", String.valueOf(time));
}
+ public long getMcastFrequency() {
+ String p = properties.getProperty("msgFrequency");
+ return new Long(p).longValue();
+ }
+
public void setMcastDropTime(long time) {
properties.setProperty("memberDropTime", String.valueOf(time));
}
-
-
+ public long getMcastDropTime() {
+ String p = properties.getProperty("memberDropTime");
+ return new Long(p).longValue();
+ }
/**
* Check if a required property is available.
@@ -195,7 +215,8 @@
this);
impl.start(level);
- log.info("Sleeping for
"+(Long.parseLong(properties.getProperty("msgFrequency"))*4)+" secs to
establish cluster membership");
+ if(log.isInfoEnabled())
+ log.info("Sleeping for
"+(Long.parseLong(properties.getProperty("msgFrequency"))*4)+" secs to
establish cluster membership");
Thread.sleep((Long.parseLong(properties.getProperty("msgFrequency"))*4));
}
@@ -247,13 +268,29 @@
if ( listener!=null ) listener.memberDisappeared(member);
}
+ public int getMcastSoTimeout() {
+ return mcastSoTimeout;
+ }
+ public void setMcastSoTimeout(int mcastSoTimeout) {
+ this.mcastSoTimeout = mcastSoTimeout;
+ properties.setProperty("mcastSoTimeout",
String.valueOf(mcastSoTimeout));
+ }
+ public int getMcastTTL() {
+ return mcastTTL;
+ }
+ public void setMcastTTL(int mcastTTL) {
+ this.mcastTTL = mcastTTL;
+ properties.setProperty("mcastTTL", String.valueOf(mcastTTL));
+ }
+
/**
* Simple test program
* @param args Command-line arguments
* @throws Exception If an error occurs
*/
public static void main(String args[]) throws Exception {
- log.info("Usage McastService hostname tcpport");
+ if(log.isInfoEnabled())
+ log.info("Usage McastService hostname tcpport");
McastService service = new McastService();
java.util.Properties p = new java.util.Properties();
p.setProperty("mcastPort","5555");
@@ -266,19 +303,5 @@
service.setProperties(p);
service.start();
Thread.sleep(60*1000*60);
- }
- public int getMcastSoTimeout() {
- return mcastSoTimeout;
- }
- public void setMcastSoTimeout(int mcastSoTimeout) {
- this.mcastSoTimeout = mcastSoTimeout;
- properties.setProperty("mcastSoTimeout",
String.valueOf(mcastSoTimeout));
- }
- public int getMcastTTL() {
- return mcastTTL;
- }
- public void setMcastTTL(int mcastTTL) {
- this.mcastTTL = mcastTTL;
- properties.setProperty("mcastTTL", String.valueOf(mcastTTL));
}
}
1.13 +8 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Index: McastServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- McastServiceImpl.java 1 Jul 2004 09:44:26 -0000 1.12
+++ McastServiceImpl.java 11 Nov 2004 14:47:27 -0000 1.13
@@ -145,16 +145,19 @@
InetSocketAddress(mcastBindAddress, port));
else socket = new MulticastSocket(port);
if (mcastBindAddress != null) {
- log.info("Setting multihome multicast interface to:" +
- mcastBindAddress);
+ if(log.isInfoEnabled())
+ log.info("Setting multihome multicast interface to:" +
+ mcastBindAddress);
socket.setInterface(mcastBindAddress);
} //end if
if ( mcastSoTimeout >= 0 ) {
- log.info("Setting cluster mcast soTimeout to "+mcastSoTimeout);
+ if(log.isInfoEnabled())
+ log.info("Setting cluster mcast soTimeout to
"+mcastSoTimeout);
socket.setSoTimeout(mcastSoTimeout);
}
if ( mcastTTL >= 0 ) {
- log.info("Setting cluster mcast TTL to " + mcastTTL);
+ if(log.isInfoEnabled())
+ log.info("Setting cluster mcast TTL to " + mcastTTL);
socket.setTimeToLive(mcastTTL);
}
}
1.18 +10 -6
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Index: ReplicationTransmitter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ReplicationTransmitter.java 29 Sep 2004 18:56:18 -0000 1.17
+++ ReplicationTransmitter.java 11 Nov 2004 14:47:27 -0000 1.18
@@ -40,7 +40,8 @@
nrOfRequests++;
totalBytes+=length;
if ( (nrOfRequests % 100) == 0 ) {
- log.info("Nr of bytes sent="+totalBytes+" over "+nrOfRequests+"
=="+(totalBytes/nrOfRequests)+" bytes/request");
+ if(log.isInfoEnabled())
+ log.info("Nr of bytes sent="+totalBytes+" over
"+nrOfRequests+" =="+(totalBytes/nrOfRequests)+" bytes/request");
}
}
@@ -48,7 +49,8 @@
public void setReplicationMode(String mode) {
String msg = IDataSenderFactory.validateMode(mode);
if (msg == null) {
- log.debug("Setting replcation mode to " + mode);
+ if(log.isDebugEnabled())
+ log.debug("Setting replcation mode to " + mode);
this.replicationMode = mode;
}
else
@@ -122,11 +124,13 @@
sender.setSuspect(false);
addStats(data.length);
}catch ( Exception x)
- {
- if ( !sender.getSuspect() ) {
- log.warn("Unable to send replicated message, is server
down?",
+ {
+ if(log.isWarnEnabled()) {
+ if ( !sender.getSuspect() ) {
+ log.warn("Unable to send replicated message, is server
down?",
x);
- }
+ }
+ }
sender.setSuspect(true);
}
1.16 +19 -16
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Index: ReplicationValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ReplicationValve.java 22 Jul 2004 15:41:15 -0000 1.15
+++ ReplicationValve.java 11 Nov 2004 14:47:27 -0000 1.16
@@ -28,7 +28,6 @@
import org.apache.catalina.cluster.CatalinaCluster;
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
-import org.apache.catalina.cluster.session.SessionMessage;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.StringManager;
@@ -73,8 +72,8 @@
* holds file endings to not call for like images and others
*/
protected java.util.regex.Pattern[] reqFilters = new
java.util.regex.Pattern[0];
-
- protected int debug = 0;
+ protected String filter ;
+
// -------------------------------------------------------------
Properties
public ReplicationValve() {
@@ -100,9 +99,11 @@
totalRequestTime+=requestTime;
nrOfRequests++;
if ( (nrOfRequests % 100) == 0 ) {
- log.info("Average request
time="+(totalRequestTime/nrOfRequests)+" ms for "+
- "Cluster overhead time="+(totalSendTime/nrOfRequests)+"
ms for "+
- nrOfRequests+" requests (Request="+totalRequestTime+"ms
Cluster="+totalSendTime+"ms).");
+ if(log.isInfoEnabled()) {
+ log.info("Average request
time="+(totalRequestTime/nrOfRequests)+" ms for "+
+ "Cluster overhead
time="+(totalSendTime/nrOfRequests)+" ms for "+
+ nrOfRequests+" requests
(Request="+totalRequestTime+"ms Cluster="+totalSendTime+"ms).");
+ }
lastSendTime=System.currentTimeMillis();
}//end if
}
@@ -139,7 +140,8 @@
ClusterManager manager =
(ClusterManager)request.getContext().getManager();
CatalinaCluster cluster =
(CatalinaCluster)getContainer().getCluster();
if ( cluster == null ) {
- log.warn("No cluster configured for this request.");
+ if(log.isWarnEnabled())
+ log.warn("No cluster configured for this request.");
return;
}
//first check for session invalidations
@@ -182,7 +184,8 @@
if ( filterfound )
return;
- log.debug("Invoking replication request on "+uri);
+ if(log.isDebugEnabled())
+ log.debug("Invoking replication request on "+uri);
ClusterMessage msg = manager.requestCompleted(id);
@@ -215,14 +218,17 @@
public void setFilter(String filter)
{
- log.debug("Loading request filters="+filter);
+ if(log.isDebugEnabled())
+ log.debug("Loading request filters="+filter);
+ this.filter = filter ;
java.util.StringTokenizer t = new
java.util.StringTokenizer(filter,";");
this.reqFilters = new java.util.regex.Pattern[t.countTokens()];
int i = 0;
while ( t.hasMoreTokens() )
{
String s = t.nextToken();
- log.debug("Request filter="+s);
+ if(log.isDebugEnabled())
+ log.debug("Request filter="+s);
try
{
reqFilters[i++] = java.util.regex.Pattern.compile(s);
@@ -233,13 +239,10 @@
}
}
- public void setDebug(int debug)
- {
- this.debug = debug;
+ public String getFilter() {
+ return filter ;
}
// ------------------------------------------------------ Protected
Methods
-
-
}
1.53 +61 -9
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Index: SimpleTcpCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- SimpleTcpCluster.java 19 Oct 2004 22:30:50 -0000 1.52
+++ SimpleTcpCluster.java 11 Nov 2004 14:47:27 -0000 1.53
@@ -481,7 +481,8 @@
public void memberAdded(Member member) {
try {
- log.info("Replication member added:" + member);
+ if(log.isInfoEnabled())
+ log.info("Replication member added:" + member);
clusterSender.add(member);
} catch ( Exception x ) {
log.error("Unable to connect to replication system.",x);
@@ -512,6 +513,48 @@
public void setPrintToScreen(boolean printToScreen) {
this.printToScreen = printToScreen;
}
+ /**
+ * @return Returns the msgSendTime.
+ */
+ public long getMsgSendTime() {
+ return msgSendTime;
+ }
+
+ /**
+ * @return Returns the lastChecked.
+ */
+ public long getLastChecked() {
+ return lastChecked;
+ }
+
+ /**
+ * @return Returns the nrOfMsgsReceived.
+ */
+ public long getNrOfMsgsReceived() {
+ return nrOfMsgsReceived;
+ }
+
+ /**
+ * @return Returns the expireSessionsOnShutdown.
+ */
+ public boolean isExpireSessionsOnShutdown() {
+ return expireSessionsOnShutdown;
+ }
+
+ /**
+ * @return Returns the printToScreen.
+ */
+ public boolean isPrintToScreen() {
+ return printToScreen;
+ }
+
+ /**
+ * @return Returns the useDirtyFlag.
+ */
+ public boolean isUseDirtyFlag() {
+ return useDirtyFlag;
+ }
+
public void setUseDirtyFlag(boolean useDirtyFlag) {
this.useDirtyFlag = useDirtyFlag;
}
@@ -526,7 +569,8 @@
if ( myobj != null && myobj instanceof SessionMessage ) {
SessionMessage msg = (SessionMessage)myobj;
- log.debug("Assuming clocks are synched: Replication
took="+(System.currentTimeMillis()-msg.getTimestamp())+" ms.");
+ if(log.isDebugEnabled())
+ log.debug("Assuming clocks are synched: Replication
took="+(System.currentTimeMillis()-msg.getTimestamp())+" ms.");
String ctxname = msg.getContextName();
//check if the message is a EVT_GET_ALL_SESSIONS,
//if so, wait until we are fully started up
@@ -539,7 +583,8 @@
mgr.messageDataReceived(msg);
else {
//this happens a lot before the system has
started up
- log.debug("Context manager doesn't exist:" +
key);
+ if(log.isDebugEnabled())
+ log.debug("Context manager doesn't exist:"
+ key);
}
}//while
} else {
@@ -547,7 +592,8 @@
if (mgr != null)
mgr.messageDataReceived(msg);
else
- log.warn("Context manager doesn't exist:" + ctxname);
+ if(log.isWarnEnabled())
+ log.warn("Context manager doesn't exist:" +
ctxname);
}//end if
} else {
//invoke all the listeners
@@ -568,7 +614,8 @@
}
public void lifecycleEvent(LifecycleEvent lifecycleEvent){
- log.debug("\nlifecycleEvent\n\nType"+lifecycleEvent.getType()+
+ if(log.isDebugEnabled())
+
log.debug("\nlifecycleEvent\n\nType"+lifecycleEvent.getType()+
"\nData"+lifecycleEvent.getData()+
"\n\n\n");
}
@@ -619,7 +666,8 @@
* is already attached to an existing web application
*/
public void installContext(String contextPath, URL war) {
- log.debug("\n\n\n\nCluster Install called for
context:"+contextPath+"\n\n\n\n");
+ if(log.isDebugEnabled())
+ log.debug("\n\n\n\nCluster Install called for
context:"+contextPath+"\n\n\n\n");
}
@@ -653,8 +701,10 @@
private void perfMessageRecvd(long timeSent) {
nrOfMsgsReceived++;
msgSendTime+=(System.currentTimeMillis()-timeSent);
- if ( (System.currentTimeMillis() - lastChecked) > 5000 ) {
- log.debug("Calc msg send time total="+msgSendTime+"ms num
request="+nrOfMsgsReceived+" average per
msg="+(msgSendTime/nrOfMsgsReceived)+"ms.");
+ if(log.isDebugEnabled()) {
+ if ( (System.currentTimeMillis() - lastChecked) > 5000 ) {
+ log.debug("Calc msg send time total="+msgSendTime+"ms num
request="+nrOfMsgsReceived+" average per
msg="+(msgSendTime/nrOfMsgsReceived)+"ms.");
+ }
}
}
@@ -687,6 +737,8 @@
this.valve = valve;
}
+ public Valve getValve() { return valve ; }
+
public void addClusterListener(MessageListener listener) {
if ( !clusterListeners.contains(listener) ) {
clusterListeners.addElement(listener);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
