This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 90029f6647 Review debug logging
90029f6647 is described below
commit 90029f6647ba7f6c585ce336927c3f2b80773a23
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 19 17:03:46 2025 +0100
Review debug logging
---
java/org/apache/catalina/authenticator/BasicAuthenticator.java | 2 +-
java/org/apache/catalina/authenticator/FormAuthenticator.java | 2 +-
java/org/apache/catalina/authenticator/LocalStrings.properties | 2 +-
java/org/apache/catalina/deploy/NamingResourcesImpl.java | 4 ++--
java/org/apache/catalina/filters/RemoteIpFilter.java | 4 ++--
java/org/apache/catalina/realm/JAASRealm.java | 6 +++---
java/org/apache/catalina/session/FileStore.java | 2 +-
java/org/apache/catalina/session/StandardManager.java | 2 +-
java/org/apache/catalina/valves/RemoteIpValve.java | 2 +-
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 1 +
java/org/apache/tomcat/util/IntrospectionUtils.java | 4 ++--
java/org/apache/tomcat/util/digester/Digester.java | 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java | 2 +-
13 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index 0b932c4192..18d2da119a 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -89,7 +89,7 @@ public class BasicAuthenticator extends AuthenticatorBase {
}
} catch (IllegalArgumentException iae) {
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("basicAuthenticator.invalidAuthorization",
iae.getMessage()));
+
log.debug(sm.getString("basicAuthenticator.invalidAuthorization"), iae);
}
}
}
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index e54cc5a2d6..56c5228284 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -245,7 +245,7 @@ public class FormAuthenticator extends AuthenticatorBase {
try {
saveRequest(request, session);
} catch (IOException ioe) {
- log.debug(sm.getString("authenticator.requestBodyTooBig"));
+ log.debug(sm.getString("authenticator.requestBodyTooBig"),
ioe);
response.sendError(HttpServletResponse.SC_FORBIDDEN,
sm.getString("authenticator.requestBodyTooBig"));
return false;
}
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 60ec6605ad..b9c62d8502 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -42,7 +42,7 @@ authenticator.unauthorized=Cannot authenticate with the
provided credentials
authenticator.userDataPermissionFail=User data does not comply with the
constraints of the resource
authenticator.userPermissionFail=User [{0}] does not have authorization to
access the resource
-basicAuthenticator.invalidAuthorization=Invalid Authorization: [{0}]
+basicAuthenticator.invalidAuthorization=Invalid Authorization header
basicAuthenticator.invalidCharset=The only permitted values are null, the
empty string or UTF-8
basicAuthenticator.notBase64=Basic Authorization credentials are not Base64
basicAuthenticator.notBasic=Authorization header method is not ''Basic''
diff --git a/java/org/apache/catalina/deploy/NamingResourcesImpl.java
b/java/org/apache/catalina/deploy/NamingResourcesImpl.java
index 0e53f74030..fb32ac3a68 100644
--- a/java/org/apache/catalina/deploy/NamingResourcesImpl.java
+++ b/java/org/apache/catalina/deploy/NamingResourcesImpl.java
@@ -979,10 +979,10 @@ public class NamingResourcesImpl extends
LifecycleMBeanBase implements Serializa
try {
m = resource.getClass().getMethod(closeMethod, (Class<?>[]) null);
} catch (SecurityException e) {
- log.debug(sm.getString("namingResources.cleanupCloseSecurity",
closeMethod, name, container));
+ log.debug(sm.getString("namingResources.cleanupCloseSecurity",
closeMethod, name, container), e);
return;
} catch (NoSuchMethodException e) {
- log.debug(sm.getString("namingResources.cleanupNoClose", name,
container, closeMethod));
+ log.debug(sm.getString("namingResources.cleanupNoClose", name,
container, closeMethod), e);
return;
}
try {
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 501543fb36..7d83b3d9fe 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -842,7 +842,7 @@ public class RemoteIpFilter extends GenericFilter {
}
} catch (IllegalArgumentException iae) {
-
log.debug(sm.getString("remoteIpFilter.invalidHostHeader", hostHeaderValue,
hostHeader));
+
log.debug(sm.getString("remoteIpFilter.invalidHostHeader", hostHeaderValue,
hostHeader), iae);
}
}
}
@@ -904,7 +904,7 @@ public class RemoteIpFilter extends GenericFilter {
try {
port = Integer.parseInt(portHeaderValue);
} catch (NumberFormatException nfe) {
- log.debug(sm.getString("remoteIpFilter.invalidPort",
portHeaderValue, getPortHeader()));
+ log.debug(sm.getString("remoteIpFilter.invalidPort",
portHeaderValue, getPortHeader()), nfe);
}
}
}
diff --git a/java/org/apache/catalina/realm/JAASRealm.java
b/java/org/apache/catalina/realm/JAASRealm.java
index 1deeb9c6f2..deb60f6b61 100644
--- a/java/org/apache/catalina/realm/JAASRealm.java
+++ b/java/org/apache/catalina/realm/JAASRealm.java
@@ -395,7 +395,7 @@ public class JAASRealm extends RealmBase {
}
} catch (AccountExpiredException e) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("jaasRealm.accountExpired",
username));
+ log.debug(sm.getString("jaasRealm.accountExpired",
username), e);
}
// JAAS checked LoginExceptions are successful authentication
// invocations so mark JAAS realm as available
@@ -403,7 +403,7 @@ public class JAASRealm extends RealmBase {
return null;
} catch (CredentialExpiredException e) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("jaasRealm.credentialExpired",
username));
+ log.debug(sm.getString("jaasRealm.credentialExpired",
username), e);
}
// JAAS checked LoginExceptions are successful authentication
// invocations so mark JAAS realm as available
@@ -411,7 +411,7 @@ public class JAASRealm extends RealmBase {
return null;
} catch (FailedLoginException e) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("jaasRealm.failedLogin", username));
+ log.debug(sm.getString("jaasRealm.failedLogin", username),
e);
}
// JAAS checked LoginExceptions are successful authentication
// invocations so mark JAAS realm as available
diff --git a/java/org/apache/catalina/session/FileStore.java
b/java/org/apache/catalina/session/FileStore.java
index 28adba7682..8b9ac3baba 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -204,7 +204,7 @@ public final class FileStore extends StoreBase {
return session;
} catch (FileNotFoundException e) {
if (contextLog.isDebugEnabled()) {
- contextLog.debug(sm.getString("fileStore.noFile", id,
file.getAbsolutePath()));
+ contextLog.debug(sm.getString("fileStore.noFile", id,
file.getAbsolutePath()), e);
}
return null;
} finally {
diff --git a/java/org/apache/catalina/session/StandardManager.java
b/java/org/apache/catalina/session/StandardManager.java
index 8fb55ff3ee..0353359c79 100644
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -167,7 +167,7 @@ public class StandardManager extends ManagerBase {
}
} catch (FileNotFoundException e) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("standardManager.noFile",
file.getAbsolutePath()));
+ log.debug(sm.getString("standardManager.noFile",
file.getAbsolutePath()), e);
}
return;
}
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 5a16e0dbf5..b2cc887c5b 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -683,7 +683,7 @@ public class RemoteIpValve extends ValveBase {
}
} catch (IllegalArgumentException iae) {
-
log.debug(sm.getString("remoteIpValve.invalidHostHeader", hostHeaderValue,
hostHeader));
+
log.debug(sm.getString("remoteIpValve.invalidHostHeader", hostHeaderValue,
hostHeader), iae);
}
}
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 27b0c046c3..1c2ad63da0 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -658,6 +658,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
}
socketWrapper.flush(true);
} catch (IOException ioe) {
+ // Exception is logged further up stack
String msg = sm.getString("upgradeHandler.sendPrefaceFail",
connectionId);
if (log.isDebugEnabled()) {
log.debug(msg);
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 30b239b4f8..647ad2e128 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -144,7 +144,7 @@ public final class IntrospectionUtils {
params[0] = InetAddress.getByName(value);
} catch (UnknownHostException exc) {
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("introspectionUtils.hostResolutionFail", value));
+
log.debug(sm.getString("introspectionUtils.hostResolutionFail", value), exc);
}
ok = false;
}
@@ -542,7 +542,7 @@ public final class IntrospectionUtils {
result = InetAddress.getByName(object);
} catch (UnknownHostException exc) {
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("introspectionUtils.hostResolutionFail", object));
+
log.debug(sm.getString("introspectionUtils.hostResolutionFail", object), exc);
}
}
diff --git a/java/org/apache/tomcat/util/digester/Digester.java
b/java/org/apache/tomcat/util/digester/Digester.java
index 00e2c3e00b..19a641f21d 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -1386,7 +1386,7 @@ public class Digester extends DefaultHandler2 {
}
} catch (URISyntaxException e) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("digester.invalidURI",
baseURI, systemId));
+ log.debug(sm.getString("digester.invalidURI",
baseURI, systemId), e);
}
}
}
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index d605c9e575..1d777a69e6 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -571,7 +571,7 @@ public class DataSourceFactory implements ObjectFactory {
log.warn("dataSourceJNDI property is configured, but local
JNDI context is null.");
}
} catch (NamingException e) {
- log.debug("The name \""+poolProperties.getDataSourceJNDI()+"\"
cannot be found in the local context.");
+ log.debug("The name \""+poolProperties.getDataSourceJNDI()+"\"
cannot be found in the local context.", e);
}
if (jndiDS==null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
