You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2015/05/22 11:30:57 UTC
svn commit: r1681056 - in /tomcat/trunk/java/org/apache/catalina/tribes:
group/interceptors/LocalStrings.properties
group/interceptors/MessageDispatchInterceptor.java
group/interceptors/ThroughputInterceptor.java
transport/nio/LocalStrings.properties
Author: remm
Date: Fri May 22 09:30:56 2015
New Revision: 1681056
URL: http://svn.apache.org/r1681056
Log:
Checkstyle fix.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1681056&r1=1681055&r2=1681056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties Fri May 22 09:30:56 2015
@@ -54,5 +54,5 @@ throughputInterceptor.report=ThroughputI
\n\tRx Msg:{7} messages\
\n\tRx Speed:{8} MB/sec (since 1st msg)\
\n\tReceived:{9} MB]\n
-twoPhaseCommitInterceptor.originalMessage.missing=Received a confirmation, but original message is missing. Id:{0}
+twoPhaseCommitInterceptor.originalMessage.missing=Received a confirmation, but original message is missing. Id:{0}
twoPhaseCommitInterceptor.heartbeat.failed=Unable to perform heartbeat on the TwoPhaseCommit interceptor.
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1681056&r1=1681055&r2=1681056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java Fri May 22 09:30:56 2015
@@ -41,7 +41,7 @@ import org.apache.juli.logging.LogFactor
public class MessageDispatchInterceptor extends ChannelInterceptorBase implements Runnable {
private static final Log log = LogFactory.getLog(MessageDispatchInterceptor.class);
protected static final StringManager sm = StringManager.getManager(MessageDispatchInterceptor.class);
-
+
protected long maxQueueSize = 1024*1024*64; //64MB
protected final FastQueue queue = new FastQueue();
protected volatile boolean run = false;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?rev=1681056&r1=1681055&r2=1681056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java Fri May 22 09:30:56 2015
@@ -93,9 +93,8 @@ public class ThroughputInterceptor exten
}
public void report(double timeTx) {
-
if ( log.isInfoEnabled() )
- log.info(sm.getString("throughputInterceptor.report",
+ log.info(sm.getString("throughputInterceptor.report",
msgTxCnt, df.format(mbTx), df.format(mbAppTx), df.format(timeTx), df.format(mbTx/timeTx),
df.format(mbAppTx/timeTx), msgTxErr, msgRxCnt, df.format(mbRx/((System.currentTimeMillis()-rxStart)/1000)),
df.format(mbRx)));
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties?rev=1681056&r1=1681055&r2=1681056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties Fri May 22 09:30:56 2015
@@ -46,7 +46,7 @@ parallelNioSender.sender.disconnected.no
parallelNioSender.sender.disconnected.sendFailed=Send failed, and sender is disconnected. Not retrying.
parallelNioSender.sendFailed.attempt=Send failed, attempt:{0} max:{1}
parallelNioSender.unable.setup.NioSender=Unable to setup NioSender.
-parallelNioSender.error.keepalive=Error during keepalive test for sender:{0}
+parallelNioSender.error.keepalive=Error during keepalive test for sender:{0}
pooledParallelSender.sender.disconnected=Sender not connected.
pooledParallelSender.unable.retrieveSender.timeout=Unable to retrieve a data sender, time out({0} ms) error.
pooledParallelSender.unable.retrieveSender=Unable to retrieve a sender from the sender pool
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org