Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 46979 invoked from network); 15 Oct 2003 14:44:46 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 15 Oct 2003 14:44:46 -0000 Received: (qmail 22762 invoked by uid 500); 15 Oct 2003 14:44:34 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 22714 invoked by uid 500); 15 Oct 2003 14:44:33 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 22701 invoked from network); 15 Oct 2003 14:44:33 -0000 Received: from unknown (HELO dukas.upc.es) (147.83.2.62) by daedalus.apache.org with SMTP; 15 Oct 2003 14:44:33 -0000 Received: from gw.ac.upc.es (gw.ac.upc.es [147.83.30.3]) by dukas.upc.es (8.12.1-20030925/8.12.1) with ESMTP id h9FEiY2a013028 for ; Wed, 15 Oct 2003 16:44:34 +0200 (MET DST) Received: from tente (80-28-211-50.adsl.nuria.telefonica-data.net [80.28.211.50]) by gw.ac.upc.es (Postfix) with ESMTP id 2DA6132943 for ; Wed, 15 Oct 2003 16:44:32 +0200 (CEST) Message-ID: <003e01c3932a$d62a1ee0$0401a8c0@tente> From: =?iso-8859-1?Q?Vicen=E7_=28AC=29?= To: "Tomcat Developers List" References: <20031015032104.18299.qmail@minotaur.apache.org> Subject: Re: cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp AsyncSocketSender.java IDataSender.java ReplicationTransmitter.java SocketSender.java Date: Wed, 15 Oct 2003 16:44:22 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1158 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N ----- Original Message ----- From: To: Sent: Wednesday, October 15, 2003 5:21 AM Subject: cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluste r/tcp AsyncSocketSender.java IDataSender.java ReplicationTransmitter.java SocketSender.java > fhanik 2003/10/14 20:21:04 > > Modified: modules/cluster/src/share/org/apache/catalina/cluster/tcp > AsyncSocketSender.java IDataSender.java > ReplicationTransmitter.java SocketSender.java > Log: > added in the suspect feature to avoid to much error printing > > Revision Changes Path > 1.2 +15 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluste r/tcp/AsyncSocketSender.java > > Index: AsyncSocketSender.java > =================================================================== > RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catal ina/cluster/tcp/AsyncSocketSender.java,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- AsyncSocketSender.java 18 Apr 2003 02:51:24 -0000 1.1 > +++ AsyncSocketSender.java 15 Oct 2003 03:21:04 -0000 1.2 > @@ -73,6 +73,7 @@ > private Socket sc = null; > private boolean isSocketConnected = false; > private SmartQueue queue = new SmartQueue(); > + private boolean suspect; > > public AsyncSocketSender(InetAddress host, int port) { > this.address = host; > @@ -137,6 +138,17 @@ > StringBuffer buf = new StringBuffer("SocketSender["); > buf.append(getAddress()).append(":").append(getPort()).append("]"); > return buf.toString(); > + } > + public boolean isSuspect() { > + return suspect; > + } > + > + public boolean getSuspect() { > + return suspect; > + } > + > + public void setSuspect(boolean suspect) { > + this.suspect = suspect; > } > > private class QueueThread extends Thread { > > > > 1.3 +5 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluste r/tcp/IDataSender.java > > Index: IDataSender.java > =================================================================== > RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catal ina/cluster/tcp/IDataSender.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- IDataSender.java 18 Apr 2003 02:51:24 -0000 1.2 > +++ IDataSender.java 15 Oct 2003 03:21:04 -0000 1.3 > @@ -80,4 +80,6 @@ > public void disconnect(); > public void sendMessage(String sessionId, byte[] data) throws java.io.IOException; > public boolean isConnected(); > + public void setSuspect(boolean suspect); > + public boolean getSuspect(); > } > > > > 1.6 +11 -8 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluste r/tcp/ReplicationTransmitter.java > > Index: ReplicationTransmitter.java > =================================================================== > RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catal ina/cluster/tcp/ReplicationTransmitter.java,v > retrieving revision 1.5 > retrieving revision 1.6 > diff -u -r1.5 -r1.6 > --- ReplicationTransmitter.java 18 Apr 2003 02:51:24 -0000 1.5 > +++ ReplicationTransmitter.java 15 Oct 2003 03:21:04 -0000 1.6 > @@ -147,18 +147,21 @@ > > public void sendMessage(String sessionId, byte[] indata) throws java.io.IOException > { > - java.util.Iterator i = map.entrySet().iterator(); > - java.util.Vector v = new java.util.Vector(); > + IDataSender[] senders = getSenders(); > byte[] data = XByteBuffer.createDataPackage(indata); > - while ( i.hasNext() ) > + for ( int i=0; i { > - IDataSender sender = (IDataSender)((java.util.Map.Entry)i.next()).getValue(); > + > + IDataSender sender = senders[i]; > try > { > sendMessageData(sessionId,data,sender); > + sender.setSuspect(false); > }catch ( Exception x) > { > - log.warn("Unable to send replicated message to "+sender+", is server down?",x); > + > + if ( !sender.getSuspect()) log.warn("Unable to send replicated message to "+sender+", is server down?",x); > + sender.setSuspect(true); > } > }//while > } > > > > 1.3 +15 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluste r/tcp/SocketSender.java > > Index: SocketSender.java > =================================================================== > RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catal ina/cluster/tcp/SocketSender.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- SocketSender.java 18 Apr 2003 02:51:24 -0000 1.2 > +++ SocketSender.java 15 Oct 2003 03:21:04 -0000 1.3 > @@ -81,6 +81,7 @@ > private int port; > private Socket sc = null; > private boolean isSocketConnected = false; > + private boolean suspect; > > public SocketSender(InetAddress host, int port) > { > @@ -143,6 +144,17 @@ > StringBuffer buf = new StringBuffer("SocketSender["); > buf.append(getAddress()).append(":").append(getPort()).append("]"); > return buf.toString(); > + } > + public boolean isSuspect() { > + return suspect; > + } > + > + public boolean getSuspect() { > + return suspect; > + } > + > + public void setSuspect(boolean suspect) { > + this.suspect = suspect; > } > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org > For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org