This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 989f80f612 Differentiate trace and debug log levels
989f80f612 is described below
commit 989f80f612cbb49d877792486b8768ba57c1670e
Author: remm <[email protected]>
AuthorDate: Fri Feb 2 10:47:07 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/authenticator/AuthenticatorBase.java | 16 ++++++++--------
java/org/apache/catalina/authenticator/SingleSignOn.java | 12 ++++++------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 95761e3311..5c4f533eca 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -499,8 +499,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (constraints != null) {
// Enforce any user data constraint for this security constraint
- if (log.isDebugEnabled()) {
- log.debug("Calling hasUserDataPermission()");
+ if (log.isTraceEnabled()) {
+ log.trace("Calling hasUserDataPermission()");
}
if (!realm.hasUserDataPermission(request, response, constraints)) {
if (log.isDebugEnabled()) {
@@ -550,8 +550,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (authRequired) {
- if (log.isDebugEnabled()) {
- log.debug("Calling authenticate()");
+ if (log.isTraceEnabled()) {
+ log.trace("Calling authenticate()");
}
if (jaspicProvider != null) {
@@ -576,8 +576,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (constraints != null) {
- if (log.isDebugEnabled()) {
- log.debug("Calling accessControl()");
+ if (log.isTraceEnabled()) {
+ log.trace("Calling accessControl()");
}
if (!realm.hasResourcePermission(request, response, constraints,
this.context)) {
if (log.isDebugEnabled()) {
@@ -592,8 +592,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
// Any and all specified constraints have been satisfied
- if (log.isDebugEnabled()) {
- log.debug("Successfully passed all security constraints");
+ if (log.isTraceEnabled()) {
+ log.trace("Successfully passed all security constraints");
}
getNext().invoke(request, response);
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 5b2b8eb5de..fe68b1dd63 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -208,8 +208,8 @@ public class SingleSignOn extends ValveBase {
request.removeNote(Constants.REQ_SSOID_NOTE);
// Has a valid user already been authenticated?
- if (containerLog.isDebugEnabled()) {
- containerLog.debug(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
+ if (containerLog.isTraceEnabled()) {
+ containerLog.trace(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
}
if (request.getUserPrincipal() != null) {
if (containerLog.isDebugEnabled()) {
@@ -221,8 +221,8 @@ public class SingleSignOn extends ValveBase {
}
// Check for the single sign on cookie
- if (containerLog.isDebugEnabled()) {
- containerLog.debug(sm.getString("singleSignOn.debug.cookieCheck"));
+ if (containerLog.isTraceEnabled()) {
+ containerLog.trace(sm.getString("singleSignOn.debug.cookieCheck"));
}
Cookie cookie = null;
Cookie cookies[] = request.getCookies();
@@ -243,8 +243,8 @@ public class SingleSignOn extends ValveBase {
}
// Look up the cached Principal associated with this cookie value
- if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
+ if (containerLog.isTraceEnabled()) {
+
containerLog.trace(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
}
SingleSignOnEntry entry = cache.get(cookie.getValue());
if (entry != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
