This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 4804e2c436 Leftovers
4804e2c436 is described below
commit 4804e2c436d88ceec2a0aeffeb3295e90a77c267
Author: remm <r...@apache.org>
AuthorDate: Mon Feb 12 13:54:56 2024 +0100
Leftovers
---
java/org/apache/catalina/tribes/membership/McastServiceImpl.java | 2 +-
java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties | 1 +
java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index b5e01a4cbb..b5306d41ae 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -631,7 +631,7 @@ public class McastServiceImpl extends
MembershipProviderBase {
if (errorCounter==0) {
log.warn(sm.getString("mcastServiceImpl.send.failed"),x);
} else {
- log.debug("Unable to send mcast message.",x);
+
log.debug(sm.getString("mcastServiceImpl.send.failed"),x);
}
if ( (++errorCounter)>=recoveryCounter ) {
errorCounter=0;
diff --git
a/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
b/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
index df2b56c77f..441b425d12 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
@@ -27,6 +27,7 @@ nioReceiver.stop.threadRunning=The NioReceiver thread did not
stop in a timely m
nioReceiver.threadpool.fail=ThreadPool cannot be initialized. Listener not
started.
nioReceiver.threadsExhausted=Channel key is registered, but has had no
interest ops for the last [{0}] ms. (cancelled: [{1}]):[{2}] last access:[{3}]
Possible cause: all threads used, perform thread dump
+nioReplicationTask.disconnect=Channel closed on the remote end, disconnecting
nioReplicationTask.error.register.key=Error registering key for read:[{0}]
nioReplicationTask.exception.drainChannel=Exception caught in
TcpReplicationThread.drainChannel.
nioReplicationTask.process.clusterMsg.failed=Processing of cluster message
failed.
diff --git
a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index 7fd5ecbe1a..f28648c3b9 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -261,7 +261,7 @@ public class NioReplicationTask extends AbstractRxTask {
private void remoteEof(SelectionKey key) {
// close channel on EOF, invalidates the key
if ( log.isDebugEnabled() ) {
- log.debug("Channel closed on the remote end, disconnecting");
+ log.debug(sm.getString("nioReplicationTask.disconnect"));
}
cancelKey(key);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
