tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSender.java PooledSocketSender.java ReplicationTransmitter.java
Date Thu, 14 Apr 2005 21:12:31 GMT
fhanik      2005/04/14 14:12:31

  Modified:    catalina/src/conf server.xml
               modules/cluster/src/share/org/apache/catalina/cluster/tcp
                        DataSender.java PooledSocketSender.java
                        ReplicationTransmitter.java
  Log:
  Added in the cluster listener to server.xml since this was removed from default config
  otherwise, clustering doesn't work out of the box,
  minor format changes in the other files
  
  Revision  Changes    Path
  1.46      +2 -0      jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- server.xml	4 Feb 2005 17:15:55 -0000	1.45
  +++ server.xml	14 Apr 2005 21:12:31 -0000	1.46
  @@ -312,6 +312,8 @@
                         deployDir="/tmp/war-deploy/"
                         watchDir="/tmp/war-listen/"
                         watchEnabled="false"/>
  +                      
  +            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
           </Cluster>
           -->        
   
  
  
  
  1.8       +8 -9      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
  
  Index: DataSender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DataSender.java	12 Apr 2005 18:56:07 -0000	1.7
  +++ DataSender.java	14 Apr 2005 21:12:31 -0000	1.8
  @@ -756,24 +756,23 @@
               time = System.currentTimeMillis();
           }
           try {
  -             int bytesRead = 0;
  +            int bytesRead = 0;
  +            if ( log.isDebugEnabled() ) log.debug("Waiting for ACK message");
               int i = socket.getInputStream().read();
               while ((i != -1) && (i != 3) && bytesRead < 10) {
  +                if ( log.isDebugEnabled() ) log.debug("Read ack byte:"+i);
                   bytesRead++;
                   i = socket.getInputStream().read();
               }
               if (i != 3) {
                   if (i == -1) {
  -                    throw new IOException(sm.getString("IDataSender.ack.eof",
  -                            getAddress(), new Integer(socket.getLocalPort())));
  +                    throw new IOException(sm.getString("IDataSender.ack.eof",getAddress(),
new Integer(socket.getLocalPort())));
                   } else {
  -                    throw new IOException(sm.getString("IDataSender.ack.wrong",
  -                            getAddress(), new Integer(socket.getLocalPort())));
  +                    throw new IOException(sm.getString("IDataSender.ack.wrong",getAddress(),
new Integer(socket.getLocalPort())));
                   }
               } else {
                   if (log.isTraceEnabled()) {
  -                    log.trace(sm.getString("IDataSender.ack.receive", address,
  -                            new Integer(socket.getLocalPort())));
  +                    log.trace(sm.getString("IDataSender.ack.receive", address,new Integer(socket.getLocalPort())));
                   }
               }
           } catch (IOException x) {
  @@ -788,4 +787,4 @@
               }
           }
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.13      +1 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
  
  Index: PooledSocketSender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PooledSocketSender.java	14 Apr 2005 20:07:59 -0000	1.12
  +++ PooledSocketSender.java	14 Apr 2005 21:12:31 -0000	1.13
  @@ -197,8 +197,7 @@
                           try {
                               mutex.wait(timeout);
                           } catch (Exception x) {
  -                            PooledSocketSender.log
  -                                    .warn(sm.getString("PoolSocketSender.senderQueue.sender.failed",parent.getAddress(),new
Integer(parent.getPort())),x);
  +                            PooledSocketSender.log.warn(sm.getString("PoolSocketSender.senderQueue.sender.failed",parent.getAddress(),new
Integer(parent.getPort())),x);
                           }//catch
                       }//end if
                       if (sender != null) {
  
  
  
  1.27      +1 -3      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ReplicationTransmitter.java	14 Apr 2005 20:07:59 -0000	1.26
  +++ ReplicationTransmitter.java	14 Apr 2005 21:12:31 -0000	1.27
  @@ -545,8 +545,6 @@
        */
       public void checkIfCloseSocket() {
           if (map.size() > 0) {
  -            if (log.isTraceEnabled())
  -                log.trace("check sender close socket");
               java.util.Iterator iter = map.entrySet().iterator();
               while (iter.hasNext()) {
                   IDataSender sender = (IDataSender) ((java.util.Map.Entry) iter
  
  
  

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


Mime
View raw message