fhanik 2003/03/20 12:46:15
Modified: modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastService.java McastServiceImpl.java
modules/cluster/src/share/org/apache/catalina/cluster/session
SimpleTcpReplicationManager.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationListener.java
ReplicationTransmitter.java ReplicationValve.java
SimpleTcpCluster.java WorkerThread.java
Log:
added logging
Revision Changes Path
1.2 +7 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- McastService.java 19 Feb 2003 20:32:10 -0000 1.1
+++ McastService.java 20 Mar 2003 20:46:12 -0000 1.2
@@ -82,6 +82,8 @@
public class McastService implements MembershipService,MembershipListener {
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( McastService.class );
/**
* The implementation specific properties
*/
@@ -180,7 +182,7 @@
try {
if ( impl != null) impl.stop();
} catch ( Exception x) {
- x.printStackTrace();
+ log.error("Unable to stop the mcast service.",x);
}
impl = null;
}
1.3 +9 -7
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- McastServiceImpl.java 5 Mar 2003 23:54:47 -0000 1.2
+++ McastServiceImpl.java 20 Mar 2003 20:46:12 -0000 1.3
@@ -82,6 +82,8 @@
import org.apache.catalina.cluster.MembershipListener;
public class McastServiceImpl
{
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( McastService.class );
/**
* Internal flag used for the listen thread that listens to the multicasting
socket.
*/
@@ -237,7 +239,7 @@
try {
receive();
} catch ( Exception x ) {
- x.printStackTrace();
+ log.warn("Error receiving mcast package.",x);
}
}
}
@@ -254,9 +256,9 @@
send();
this.sleep(time);
} catch ( Exception x ) {
- x.printStackTrace();
+ log.warn("Unable to send mcast message.",x);
}
}
}
}//class SenderThread
-}
\ No newline at end of file
+}
1.4 +5 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Index: SimpleTcpReplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleTcpReplicationManager.java 15 Mar 2003 00:20:56 -0000 1.3
+++ SimpleTcpReplicationManager.java 20 Mar 2003 20:46:14 -0000 1.4
@@ -110,6 +110,8 @@
*/
public class SimpleTcpReplicationManager extends
org.apache.catalina.session.StandardManager
{
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( SimpleTcpCluster.class );
//the channel configuration
protected String mChannelConfig = null;
1.2 +6 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java
Index: ReplicationListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReplicationListener.java 19 Feb 2003 20:32:11 -0000 1.1
+++ ReplicationListener.java 20 Mar 2003 20:46:14 -0000 1.2
@@ -83,7 +83,8 @@
public class ReplicationListener extends Thread
{
-
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( SimpleTcpCluster.class );
private ThreadPool pool = null;
private boolean doListen = false;
private ListenCallback callback;
@@ -108,7 +109,7 @@
}
catch ( Exception x )
{
- x.printStackTrace();
+ log.error("Unable to start cluster listener.",x);
}
}
1.2 +7 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReplicationTransmitter.java 19 Feb 2003 20:32:11 -0000 1.1
+++ ReplicationTransmitter.java 20 Mar 2003 20:46:14 -0000 1.2
@@ -76,6 +76,9 @@
public class ReplicationTransmitter
{
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( SimpleTcpCluster.class );
+
private java.util.HashMap map = new java.util.HashMap();
public ReplicationTransmitter(IDataSender[] senders)
{
@@ -156,7 +159,7 @@
sender.sendMessage(data);
}catch ( Exception x)
{
- x.printStackTrace();
+ log.warn("Unable to send replicated message, is server down?",x);
}
}//while
1.2 +7 -7
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReplicationValve.java 19 Feb 2003 20:32:11 -0000 1.1
+++ ReplicationValve.java 20 Mar 2003 20:46:14 -0000 1.2
@@ -107,7 +107,8 @@
public class ReplicationValve
extends ValveBase {
-
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( SimpleTcpCluster.class );
// ----------------------------------------------------- Instance Variables
@@ -285,8 +286,7 @@
if (logger != null)
logger.log(this.toString() + ": " + message, throwable);
else {
- System.out.println(this.toString() + ": " + message);
- throwable.printStackTrace(System.out);
+ log.warn(message,throwable);
}
}
1.8 +7 -1
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleTcpCluster.java 20 Mar 2003 00:19:27 -0000 1.7
+++ SimpleTcpCluster.java 20 Mar 2003 20:46:14 -0000 1.8
@@ -1,7 +1,13 @@
/*
+<<<<<<< SimpleTcpCluster.java
* $Header$
* $Revision$
* $Date$
+=======
+ * $Header$
+ * $Revision$
+ * $Date$
+>>>>>>> 1.7
*
* ====================================================================
*
1.2 +8 -6
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/WorkerThread.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkerThread.java 19 Feb 2003 20:32:11 -0000 1.1
+++ WorkerThread.java 20 Mar 2003 20:46:14 -0000 1.2
@@ -84,6 +84,8 @@
*/
public class WorkerThread extends Thread
{
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog( SimpleTcpCluster.class );
private ByteBuffer buffer = ByteBuffer.allocate (1024);
private ThreadPool pool;
private SelectionKey key;
@@ -109,7 +111,7 @@
// sleep and release object lock
this.wait();
} catch (InterruptedException e) {
- e.printStackTrace();
+ log.info("TCP worker thread interrupted in cluster",e);
// clear interrupt status
this.interrupted();
}
@@ -119,13 +121,13 @@
try {
drainChannel (key);
} catch (Exception e) {
- System.err.println ("Caught '"
+ log.info ("TCP Worker thread in cluster caught '"
+ e + "' closing channel");
// close channel and nudge selector
try {
key.channel().close();
} catch (IOException ex) {
- ex.printStackTrace();
+ log.error("Unable to close channel.",ex);
}
key.selector().wakeup();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
