This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4bc56cdb61 Review info level logging.
4bc56cdb61 is described below
commit 4bc56cdb610b85baaf25a9b71adcc83477bdc560
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 19 16:04:57 2025 +0100
Review info level logging.
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
java/org/apache/catalina/core/OpenSSLLifecycleListener.java | 2 +-
.../apache/catalina/tribes/membership/McastServiceImpl.java | 6 +++++-
java/org/apache/tomcat/util/modeler/Registry.java | 10 ++++++++--
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 4 ++--
.../org/apache/tomcat/util/net/openssl/panama/OpenSSLUtil.java | 4 ++--
.../org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java | 6 +++++-
7 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 625217779f..8393167160 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -180,7 +180,7 @@ public class AprLifecycleListener implements
LifecycleListener {
} catch (Throwable t) {
Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(throwable);
- log.info(sm.getString("aprListener.aprDestroy"));
+ log.warn(sm.getString("aprListener.aprDestroy"),
throwable);
}
}
}
diff --git a/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
b/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
index c8360a55fc..1e314ba87b 100644
--- a/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
+++ b/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
@@ -125,7 +125,7 @@ public class OpenSSLLifecycleListener implements
LifecycleListener {
} catch (Throwable t) {
Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(throwable);
- log.info(sm.getString("openssllistener.destroy"));
+ log.warn(sm.getString("openssllistener.destroy"),
throwable);
}
}
}
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index 7d766e8ac2..160f7d2996 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -202,7 +202,11 @@ public class McastServiceImpl extends
MembershipProviderBase {
* On some platforms (e.g. Linux) it is not possible to bind
to the multicast address. In this case only
* bind to the port.
*/
- log.info(sm.getString("mcastServiceImpl.bind.failed"));
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("mcastServiceImpl.bind.failed"), e);
+ } else {
+ log.info(sm.getString("mcastServiceImpl.bind.failed"));
+ }
socket = new MulticastSocket(port);
}
} else {
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index cd87fadb28..7743568211 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -338,9 +338,12 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
MBeanInfo info;
try {
info = getMBeanServer().getMBeanInfo(oname);
- } catch (Exception e) {
+ } catch (InstanceNotFoundException e) {
log.info(sm.getString("registry.noMetadata", oname));
return null;
+ } catch (Exception e) {
+ log.warn(sm.getString("registry.noMetadata", oname), e);
+ return null;
}
MBeanAttributeInfo[] attInfo = info.getAttributes();
@@ -366,9 +369,12 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
MBeanInfo info;
try {
info = getMBeanServer().getMBeanInfo(oname);
- } catch (Exception e) {
+ } catch (InstanceNotFoundException e) {
log.info(sm.getString("registry.noMetadata", oname));
return null;
+ } catch (Exception e) {
+ log.warn(sm.getString("registry.noMetadata", oname), e);
+ return null;
}
MBeanOperationInfo[] attInfo = info.getOperations();
for (MBeanOperationInfo mBeanOperationInfo : attInfo) {
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
index 4d0e89491f..25c5030981 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
@@ -110,7 +110,7 @@ public class OpenSSLUtil extends SSLUtilBase {
// No (or invalid?) certificate chain was provided for the cert
String msg = sm.getString("openssl.nonJsseChain",
certificate.getCertificateChainFile());
if (log.isDebugEnabled()) {
- log.info(msg, e);
+ log.debug(msg, e);
} else {
log.info(msg);
}
@@ -123,7 +123,7 @@ public class OpenSSLUtil extends SSLUtilBase {
String msg = sm.getString("openssl.nonJsseCertificate",
certificate.getCertificateFile(),
certificate.getCertificateKeyFile());
if (log.isDebugEnabled()) {
- log.info(msg, e);
+ log.debug(msg, e);
} else {
log.info(msg);
}
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLUtil.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLUtil.java
index 458e874482..3cc9bce6b6 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLUtil.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLUtil.java
@@ -80,7 +80,7 @@ public class OpenSSLUtil extends SSLUtilBase {
// No (or invalid?) certificate chain was provided for the cert
String msg = sm.getString("openssl.nonJsseChain",
certificate.getCertificateChainFile());
if (log.isDebugEnabled()) {
- log.info(msg, e);
+ log.debug(msg, e);
} else {
log.info(msg);
}
@@ -93,7 +93,7 @@ public class OpenSSLUtil extends SSLUtilBase {
String msg = sm.getString("openssl.nonJsseCertificate",
certificate.getCertificateFile(),
certificate.getCertificateKeyFile());
if (log.isDebugEnabled()) {
- log.info(msg, e);
+ log.debug(msg, e);
} else {
log.info(msg);
}
diff --git a/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
b/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
index 8c2217c6b7..dcf44efc0a 100644
--- a/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
+++ b/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
@@ -136,7 +136,11 @@ public class AsyncChannelWrapperSecure implements
AsyncChannelWrapper {
try {
socketChannel.close();
} catch (IOException e) {
- log.info(sm.getString("asyncChannelWrapperSecure.closeFail"));
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("asyncChannelWrapperSecure.closeFail"),
e);
+ } else {
+ log.info(sm.getString("asyncChannelWrapperSecure.closeFail"));
+ }
}
executor.shutdownNow();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
