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 a5ce36f38e Reduce log verbosity for Kubernetes
a5ce36f38e is described below
commit a5ce36f38ed1afb0e97730a218b03fad131bd410
Author: remm <[email protected]>
AuthorDate: Sat Mar 28 17:12:33 2026 +0100
Reduce log verbosity for Kubernetes
---
.../catalina/tribes/membership/cloud/AbstractStreamProvider.java | 2 +-
.../apache/catalina/tribes/membership/cloud/LocalStrings.properties | 4 ++--
.../apache/catalina/tribes/membership/cloud/TokenStreamProvider.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
index 5f99a22800..66cf537f13 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
@@ -81,7 +81,7 @@ public abstract class AbstractStreamProvider implements
StreamProvider {
public URLConnection openConnection(String url, Map<String,String>
headers, int connectTimeout, int readTimeout)
throws IOException {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("abstractStream.connection",
getClass().getSimpleName(), url, headers,
+ log.debug(sm.getString("abstractStream.connection",
getClass().getSimpleName(), url,
Integer.toString(connectTimeout),
Integer.toString(readTimeout)));
}
URLConnection connection;
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
index 38b5df453b..4febddf80a 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
@@ -14,7 +14,7 @@
# limitations under the License.
abstractStream.CACertUndefined=CA cert file undefined
-abstractStream.connection=[{0}] opening connection: url [{1}], headers [{2}],
connectTimeout [{3}], readTimeout [{4}]
+abstractStream.connection=[{0}] opening connection: url [{1}], connectTimeout
[{2}], readTimeout [{3}]
abstractStream.fileNotFound=CA cert file [{0}] not found
abstractStream.invalidTimeout=Neither connectTimeout [{0}] nor readTimeout
[{1}] can be less than 0 for URLConnection
abstractStream.trustManagerError=Could not create trust manager for [{0}]
@@ -38,4 +38,4 @@ kubernetesMembershipProvider.noNamespace=Namespace not set
kubernetesMembershipProvider.serviceAccountTokenMissing=Service account token
not found at [{0}]
kubernetesMembershipProvider.streamError=Failed to open stream
-tokenStream.failedConnection=Failed connection to [{0}] with token [{1}]
+tokenStream.failedConnection=Failed connection to [{0}]
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
index 46aeb4db11..71a3dc01da 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
+++ b/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
@@ -61,7 +61,7 @@ public class TokenStreamProvider extends
AbstractStreamProvider {
return super.openStream(url, headers, connectTimeout, readTimeout);
} catch (IOException ioe) {
// Add debug information
- throw new IOException(sm.getString("tokenStream.failedConnection",
url, token), ioe);
+ throw new IOException(sm.getString("tokenStream.failedConnection",
url), ioe);
}
}
}
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 86569a0589..eb5c0e8a6d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -289,6 +289,10 @@
<code>AES/GCM/NoPadding</code>. (markt)
</scode>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <fix>
+ Reduce log verbosity of the Kubernetes connection attempts and failure.
+ (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
