Author: kfujino
Date: Thu May 21 09:56:49 2015
New Revision: 1680795
URL: http://svn.apache.org/r1680795
Log:
Use StringManager to provide i18n support in the
org.apache.catalina.tribes.transport.bio package.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1680795&r1=1680794&r2=1680795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Thu May 21 09:56:49 2015
@@ -24,6 +24,7 @@ import org.apache.catalina.tribes.io.Obj
import org.apache.catalina.tribes.transport.AbstractRxTask;
import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.catalina.tribes.transport.RxTaskPool;
+import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -31,6 +32,8 @@ public class BioReceiver extends Receive
private static final Log log = LogFactory.getLog(BioReceiver.class);
+ protected static final StringManager sm =
StringManager.getManager(BioReceiver.class);
+
protected ServerSocket serverSocket;
public BioReceiver() {
@@ -43,7 +46,7 @@ public class BioReceiver extends Receive
try {
setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
} catch (Exception x) {
- log.fatal("ThreadPool can initilzed. Listener not started", x);
+ log.fatal(sm.getString("bioReceiver.threadpool.fail"), x);
if ( x instanceof IOException ) throw (IOException)x;
else throw new IOException(x.getMessage());
}
@@ -54,7 +57,7 @@ public class BioReceiver extends Receive
t.setDaemon(true);
t.start();
} catch (Exception x) {
- log.fatal("Unable to start cluster receiver", x);
+ log.fatal(sm.getString("bioReceiver.start.fail"), x);
if ( x instanceof IOException ) throw (IOException)x;
else throw new IOException(x.getMessage());
}
@@ -79,7 +82,7 @@ public class BioReceiver extends Receive
this.serverSocket.close();
} catch (Exception x) {
if (log.isDebugEnabled()) {
- log.debug("Failed to close socket", x);
+ log.debug(sm.getString("bioReceiver.socket.closeFailed"), x);
}
}
super.stop();
@@ -100,13 +103,13 @@ public class BioReceiver extends Receive
try {
listen();
} catch (Exception x) {
- log.error("Unable to run replication listener.", x);
+ log.error(sm.getString("bioReceiver.run.fail"), x);
}
}
public void listen() throws Exception {
if (doListen()) {
- log.warn("ServerSocket already started");
+ log.warn(sm.getString("bioReceiver.already.started"));
return;
}
setListen(true);
@@ -115,7 +118,7 @@ public class BioReceiver extends Receive
Socket socket = null;
if ( getTaskPool().available() < 1 ) {
if ( log.isWarnEnabled() )
- log.warn("All BIO server replication threads are busy,
unable to handle more requests until a thread is freed up.");
+ log.warn(sm.getString("bioReceiver.threads.busy"));
}
BioReplicationTask task =
(BioReplicationTask)getTaskPool().getRxTask();
if ( task == null ) continue; //should never happen
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1680795&r1=1680794&r2=1680795&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
Thu May 21 09:56:49 2015
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.io.Lis
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.transport.AbstractRxTask;
import org.apache.catalina.tribes.transport.Constants;
+import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -43,9 +44,10 @@ import org.apache.juli.logging.LogFactor
*/
public class BioReplicationTask extends AbstractRxTask {
-
private static final Log log = LogFactory.getLog( BioReplicationTask.class
);
+ protected static final StringManager sm =
StringManager.getManager(BioReplicationTask.class);
+
protected Socket socket;
protected ObjectReader reader;
@@ -61,20 +63,20 @@ public class BioReplicationTask extends
try {
drainSocket();
} catch ( Exception x ) {
- log.error("Unable to service bio socket", x);
+ log.error(sm.getString("bioReplicationTask.unable.service"), x);
}finally {
try {
socket.close();
}catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug("Failed to close socket", e);
+
log.debug(sm.getString("bioReplicationTask.socket.closeFailed"), e);
}
}
try {
reader.close();
}catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug("Failed to close reader", e);
+
log.debug(sm.getString("bioReplicationTask.reader.closeFailed"), e);
}
}
reader = null;
@@ -113,7 +115,7 @@ public class BioReplicationTask extends
if (ChannelData.sendAckSync(msgs[i].getOptions()))
sendAck(Constants.ACK_COMMAND);
}catch ( Exception x ) {
if (ChannelData.sendAckSync(msgs[i].getOptions()))
sendAck(Constants.FAIL_ACK_COMMAND);
- log.error("Error thrown from messageDataReceived.",x);
+
log.error(sm.getString("bioReplicationTask.messageDataReceived.error"),x);
}
if ( getUseBufferPool() ) {
BufferPool.getBufferPool().returnBuffer(msgs[i].getMessage());
@@ -159,7 +161,7 @@ public class BioReplicationTask extends
log.trace("ACK sent to " + socket.getPort());
}
} catch ( java.io.IOException x ) {
- log.warn("Unable to send ACK back through channel, channel
disconnected?: "+x.getMessage());
+ log.warn(sm.getString("bioReplicationTask.unable.sendAck",
x.getMessage()));
}
}
@@ -170,14 +172,14 @@ public class BioReplicationTask extends
socket.close();
}catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug("Failed to close socket", e);
+
log.debug(sm.getString("bioReplicationTask.socket.closeFailed"), e);
}
}
try {
reader.close();
}catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug("Failed to close reader", e);
+
log.debug(sm.getString("bioReplicationTask.reader.closeFailed"), e);
}
}
reader = null;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=1680795&r1=1680794&r2=1680795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Thu May 21 09:56:49 2015
@@ -47,7 +47,7 @@ public class BioSender extends AbstractS
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
StringManager.getManager(BioSender.class);
// ----------------------------------------------------- Instance Variables
@@ -92,7 +92,7 @@ public class BioSender extends AbstractS
closeSocket();
if (connect) {
if (log.isDebugEnabled())
- log.debug(sm.getString("IDataSender.disconnect",
getAddress().getHostAddress(), new Integer(getPort()), new Long(0)));
+ log.debug(sm.getString("bioSender.disconnect",
getAddress().getHostAddress(), new Integer(getPort()), new Long(0)));
}
}
@@ -109,7 +109,7 @@ public class BioSender extends AbstractS
} catch (IOException x) {
SenderState.getSenderState(getDestination()).setSuspect();
exception = x;
- if (log.isTraceEnabled())
log.trace(sm.getString("IDataSender.send.again",
getAddress().getHostAddress(),new Integer(getPort())),x);
+ if (log.isTraceEnabled())
log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),new Integer(getPort())),x);
while ( getAttempt()<getMaxRetryAttempts() ) {
try {
setAttempt(getAttempt()+1);
@@ -167,11 +167,11 @@ public class BioSender extends AbstractS
setRequestCount(0);
setConnectTime(System.currentTimeMillis());
if (log.isDebugEnabled())
- log.debug(sm.getString("IDataSender.openSocket",
getAddress().getHostAddress(), new Integer(getPort()), new Long(0)));
+ log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), new Integer(getPort()), new Long(0)));
} catch (IOException ex1) {
SenderState.getSenderState(getDestination()).setSuspect();
if (log.isDebugEnabled())
-
log.debug(sm.getString("IDataSender.openSocket.failure",getAddress().getHostAddress(),
new Integer(getPort()),new Long(0)), ex1);
+
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
new Integer(getPort()),new Long(0)), ex1);
throw (ex1);
}
@@ -198,7 +198,7 @@ public class BioSender extends AbstractS
setRequestCount(0);
setConnected(false);
if (log.isDebugEnabled())
-
log.debug(sm.getString("IDataSender.closeSocket",getAddress().getHostAddress(),
new Integer(getPort()),new Long(0)));
+
log.debug(sm.getString("bioSender.closeSocket",getAddress().getHostAddress(),
new Integer(getPort()),new Long(0)));
}
}
@@ -258,13 +258,13 @@ public class BioSender extends AbstractS
i = soIn.read();
}
if (!ackReceived) {
- if (i == -1) 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())));
+ if (i == -1) throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(), new
Integer(socket.getLocalPort())));
+ else throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(), new
Integer(socket.getLocalPort())));
} else if ( failAckReceived && getThrowOnFailedAck()) {
- throw new RemoteProcessException("Received a failed
ack:org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA");
+ throw new
RemoteProcessException(sm.getString("bioSender.fail.AckReceived"));
}
} catch (IOException x) {
- String errmsg = sm.getString("IDataSender.ack.missing",
getAddress(),new Integer(socket.getLocalPort()), new Long(getTimeout()));
+ String errmsg = sm.getString("bioSender.ack.missing",
getAddress(),new Integer(socket.getLocalPort()), new Long(getTimeout()));
if ( SenderState.getSenderState(getDestination()).isReady() ) {
SenderState.getSenderState(getDestination()).setSuspect();
if ( log.isWarnEnabled() ) log.warn(errmsg, x);
Added:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties?rev=1680795&view=auto
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
Thu May 21 09:56:49 2015
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bioReceiver.threadpool.fail=ThreadPool can initilzed. Listener not started
+bioReceiver.start.fail=Unable to start cluster receiver
+bioReceiver.socket.closeFailed=Failed to close socket
+bioReceiver.run.fail=Unable to run replication listener.
+bioReceiver.already.started=ServerSocket already started
+bioReceiver.threads.busy=All BIO server replication threads are busy, unable
to handle more requests until a thread is freed up.
+bioReplicationTask.unable.service=Unable to service bio socket
+bioReplicationTask.socket.closeFailed=Failed to close socket
+bioReplicationTask.reader.closeFailed=Failed to close reader
+bioReplicationTask.messageDataReceived.error=Error thrown from
messageDataReceived.
+bioReplicationTask.unable.sendAck=Unable to send ACK back through channel,
channel disconnected?: {0}
+bioSender.disconnect=Sender disconnect from [{0}:{1,number,integer}]
(disconnect count {2,number,integer})
+bioSender.send.again=Send data again to [{0}:{1,number,integer}]
+bioSender.openSocket=Sender open socket to [{0}:{1,number,integer}] (open
count {2,number,integer})
+bioSender.openSocket.failure=Open sender socket [{0}:{1,number,integer}]
failure! (open failure count {2,number,integer})
+bioSender.closeSocket=Sender close socket to [{0}:{1,number,integer}] (close
count {2,number,integer})
+bioSender.ack.eof=EOF reached at local port [{0}:{1,number,integer}]
+bioSender.ack.wrong=Missing correct ACK after 10 bytes read at local port
[{0}:{1,number,integer}]
+bioSender.fail.AckReceived=Received a failed
ack:org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA
+bioSender.ack.missing=Unable to read acknowledgement from
[{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, and
trying again.
+pooledMultiSender.unable.retrieve.sender=Unable to retrieve a data sender,
time out{0} ms) error.
+pooledMultiSender.retrieve.fail=Unable to retrieve a sender from the sender
pool
\ No newline at end of file
Propchange:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=1680795&r1=1680794&r2=1680795&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
Thu May 21 09:56:49 2015
@@ -23,9 +23,11 @@ import org.apache.catalina.tribes.transp
import org.apache.catalina.tribes.transport.DataSender;
import org.apache.catalina.tribes.transport.MultiPointSender;
import org.apache.catalina.tribes.transport.PooledSender;
+import org.apache.catalina.tribes.util.StringManager;
public class PooledMultiSender extends PooledSender {
+ protected static final StringManager sm =
StringManager.getManager(PooledMultiSender.class);
public PooledMultiSender() {
// NO-OP
@@ -37,8 +39,9 @@ public class PooledMultiSender extends P
try {
sender = (MultiPointSender)getSender();
if (sender == null) {
- ChannelException cx = new ChannelException("Unable to retrieve
a data sender, time out("+getMaxWait()+" ms) error.");
- for (int i = 0; i < destination.length; i++)
cx.addFaultyMember(destination[i], new NullPointerException("Unable to retrieve
a sender from the sender pool"));
+ ChannelException cx = new
ChannelException(sm.getString("pooledMultiSender.unable.retrieve.sender",
getMaxWait()));
+ for (int i = 0; i < destination.length; i++)
+ cx.addFaultyMember(destination[i], new
NullPointerException(sm.getString("pooledMultiSender.retrieve.fail")));
throw cx;
} else {
sender.sendMessage(destination, msg);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
