This is an automated email from the ASF dual-hosted git repository. remm 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 d61ee4b6ce Differentiate trace and debug log levels d61ee4b6ce is described below commit d61ee4b6cef976c7252d74086610c414cf809ce0 Author: remm <r...@apache.org> AuthorDate: Mon Feb 5 10:49:57 2024 +0100 Differentiate trace and debug log levels --- .../membership/cloud/AbstractStreamProvider.java | 8 +++---- .../membership/cloud/CloudMembershipService.java | 8 +++---- .../valves/CrawlerSessionManagerValve.java | 20 ++++++++-------- .../catalina/valves/ExtendedAccessLogValve.java | 8 +++---- .../apache/catalina/valves/PersistentValve.java | 28 +++++++++++----------- java/org/apache/catalina/valves/RemoteIpValve.java | 8 +++---- .../catalina/valves/StuckThreadDetectionValve.java | 4 ++-- .../catalina/valves/rewrite/RewriteValve.java | 12 +++++----- webapps/docs/changelog.xml | 4 ++++ 9 files changed, 52 insertions(+), 48 deletions(-) diff --git a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java index 9902ec1ff2..2c283890a7 100644 --- a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java +++ b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java @@ -106,12 +106,12 @@ public abstract class AbstractStreamProvider implements StreamProvider { URLConnection connection = openConnection(url, headers, connectTimeout, readTimeout); if (connection instanceof HttpsURLConnection) { ((HttpsURLConnection) connection).setSSLSocketFactory(getSocketFactory()); - if (log.isDebugEnabled()) { - log.debug(String.format("Using HttpsURLConnection with SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url)); + if (log.isTraceEnabled()) { + log.trace(String.format("Using HttpsURLConnection with SSLSocketFactory [%s] for url [%s].", getSocketFactory(), url)); } } else { - if (log.isDebugEnabled()) { - log.debug(String.format("Using URLConnection for url [%s].", url)); + if (log.isTraceEnabled()) { + log.trace(String.format("Using URLConnection for url [%s].", url)); } } return connection.getInputStream(); diff --git a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java index f072861661..19c5e72362 100644 --- a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java +++ b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java @@ -139,8 +139,8 @@ public class CloudMembershipService extends MembershipServiceBase } else if (DNS.equals(provider)) { provider = DNS_PROVIDER_CLASS; } - if (log.isDebugEnabled()) { - log.debug("Using membershipProvider: " + provider); + if (log.isTraceEnabled()) { + log.trace("Using membershipProvider: " + provider); } membershipProvider = (MembershipProvider) Class.forName(provider).getConstructor().newInstance(); @@ -182,8 +182,8 @@ public class CloudMembershipService extends MembershipServiceBase @Override public void setLocalMemberProperties(String listenHost, int listenPort, int securePort, int udpPort) { - if (log.isDebugEnabled()) { - log.debug(String.format("setLocalMemberProperties(%s, %d, %d, %d)", listenHost, + if (log.isTraceEnabled()) { + log.trace(String.format("setLocalMemberProperties(%s, %d, %d, %d)", listenHost, Integer.valueOf(listenPort), Integer.valueOf(securePort), Integer.valueOf(udpPort))); } properties.setProperty("tcpListenHost", listenHost); diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java index 04472e5562..18cd9a26b4 100644 --- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java +++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java @@ -180,8 +180,8 @@ public class CrawlerSessionManagerValve extends ValveBase { String clientIp = request.getRemoteAddr(); String clientIdentifier = getClientIdentifier(request.getHost(), request.getContext(), clientIp); - if (log.isDebugEnabled()) { - log.debug(request.hashCode() + ": ClientIdentifier=" + clientIdentifier + ", RequestedSessionId=" + + if (log.isTraceEnabled()) { + log.trace(request.hashCode() + ": ClientIdentifier=" + clientIdentifier + ", RequestedSessionId=" + request.getRequestedSessionId()); } @@ -198,15 +198,15 @@ public class CrawlerSessionManagerValve extends ValveBase { // If more than one UA header - assume not a bot if (uaHeader != null && !uaHeaders.hasMoreElements()) { - if (log.isDebugEnabled()) { - log.debug(request.hashCode() + ": UserAgent=" + uaHeader); + if (log.isTraceEnabled()) { + log.trace(request.hashCode() + ": UserAgent=" + uaHeader); } if (uaPattern.matcher(uaHeader).matches()) { isBot = true; - if (log.isDebugEnabled()) { - log.debug(request.hashCode() + ": Bot found. UserAgent=" + uaHeader); + if (log.isTraceEnabled()) { + log.trace(request.hashCode() + ": Bot found. UserAgent=" + uaHeader); } } } @@ -214,8 +214,8 @@ public class CrawlerSessionManagerValve extends ValveBase { if (ipPattern != null && ipPattern.matcher(clientIp).matches()) { isBot = true; - if (log.isDebugEnabled()) { - log.debug(request.hashCode() + ": Bot found. IP=" + clientIp); + if (log.isTraceEnabled()) { + log.trace(request.hashCode() + ": Bot found. IP=" + clientIp); } } @@ -224,8 +224,8 @@ public class CrawlerSessionManagerValve extends ValveBase { sessionId = clientIdSessionId.get(clientIdentifier); if (sessionId != null) { request.setRequestedSessionId(sessionId); - if (log.isDebugEnabled()) { - log.debug(request.hashCode() + ": SessionID=" + sessionId); + if (log.isTraceEnabled()) { + log.trace(request.hashCode() + ": SessionID=" + sessionId); } } } diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java index c9cba36f83..fd2439ad2d 100644 --- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java +++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java @@ -501,8 +501,8 @@ public class ExtendedAccessLogValve extends AccessLogValve { String token = tokenizer.getToken(); while (token != null) { - if (log.isDebugEnabled()) { - log.debug("token = " + token); + if (log.isTraceEnabled()) { + log.trace("token = " + token); } AccessLogElement element = getLogElement(token, tokenizer); if (element == null) { @@ -518,8 +518,8 @@ public class ExtendedAccessLogValve extends AccessLogValve { } token = tokenizer.getToken(); } - if (log.isDebugEnabled()) { - log.debug("finished decoding with element size of: " + list.size()); + if (log.isTraceEnabled()) { + log.trace("finished decoding with element size of: " + list.size()); } return list.toArray(new AccessLogElement[0]); } catch (IOException e) { diff --git a/java/org/apache/catalina/valves/PersistentValve.java b/java/org/apache/catalina/valves/PersistentValve.java index 48fcb395f9..724e030368 100644 --- a/java/org/apache/catalina/valves/PersistentValve.java +++ b/java/org/apache/catalina/valves/PersistentValve.java @@ -117,13 +117,13 @@ public class PersistentValve extends ValveBase { // request without session if (isRequestWithoutSession(request.getDecodedRequestURI())) { - if (containerLog.isDebugEnabled()) { - containerLog.debug(sm.getString("persistentValve.requestIgnore", request.getDecodedRequestURI())); + if (containerLog.isTraceEnabled()) { + containerLog.trace(sm.getString("persistentValve.requestIgnore", request.getDecodedRequestURI())); } getNext().invoke(request, response); return; - } else if (containerLog.isDebugEnabled()) { - containerLog.debug(sm.getString("persistentValve.requestProcess", request.getDecodedRequestURI())); + } else if (containerLog.isTraceEnabled()) { + containerLog.trace(sm.getString("persistentValve.requestProcess", request.getDecodedRequestURI())); } // Select the Context to be used for this Request @@ -181,8 +181,8 @@ public class PersistentValve extends ValveBase { } if (session != null) { if (!session.isValid() || isSessionStale(session, System.currentTimeMillis())) { - if (containerLog.isDebugEnabled()) { - containerLog.debug("session swapped in is invalid or expired"); + if (containerLog.isTraceEnabled()) { + containerLog.trace("session swapped in is invalid or expired"); } session.expire(); store.remove(sessionId); @@ -197,8 +197,8 @@ public class PersistentValve extends ValveBase { } } } - if (containerLog.isDebugEnabled()) { - containerLog.debug("sessionId: " + sessionId); + if (containerLog.isTraceEnabled()) { + containerLog.trace("sessionId: " + sessionId); } // Ask the next valve to process the request. @@ -219,8 +219,8 @@ public class PersistentValve extends ValveBase { newsessionId = hsess.getIdInternal(); } - if (containerLog.isDebugEnabled()) { - containerLog.debug("newsessionId: " + newsessionId); + if (containerLog.isTraceEnabled()) { + containerLog.trace("newsessionId: " + newsessionId); } if (newsessionId != null) { try { @@ -241,17 +241,17 @@ public class PersistentValve extends ValveBase { } } if (!stored) { - if (containerLog.isDebugEnabled()) { + if (containerLog.isTraceEnabled()) { containerLog - .debug("newsessionId store: " + store + " session: " + session + + .trace("newsessionId store: " + store + " session: " + session + " valid: " + (session == null ? "N/A" : Boolean.toString(session.isValid())) + " stale: " + isSessionStale(session, System.currentTimeMillis())); } } } else { - if (containerLog.isDebugEnabled()) { - containerLog.debug("newsessionId Manager: " + manager); + if (containerLog.isTraceEnabled()) { + containerLog.trace("newsessionId Manager: " + manager); } } } finally { diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java index ae3c74230d..13a745467f 100644 --- a/java/org/apache/catalina/valves/RemoteIpValve.java +++ b/java/org/apache/catalina/valves/RemoteIpValve.java @@ -707,8 +707,8 @@ public class RemoteIpValve extends ValveBase { request.setAttribute(Globals.REQUEST_FORWARDED_ATTRIBUTE, Boolean.TRUE); - if (log.isDebugEnabled()) { - log.debug("Incoming request " + request.getRequestURI() + " with originalRemoteAddr [" + + if (log.isTraceEnabled()) { + log.trace("Incoming request " + request.getRequestURI() + " with originalRemoteAddr [" + originalRemoteAddr + "], originalRemoteHost=[" + originalRemoteHost + "], originalSecure=[" + originalSecure + "], originalScheme=[" + originalScheme + "], originalServerName=[" + originalServerName + "], originalServerPort=[" + originalServerPort + @@ -718,8 +718,8 @@ public class RemoteIpValve extends ValveBase { request.getServerPort() + "]"); } } else { - if (log.isDebugEnabled()) { - log.debug("Skip RemoteIpValve for request " + request.getRequestURI() + " with originalRemoteAddr '" + + if (log.isTraceEnabled()) { + log.trace("Skip RemoteIpValve for request " + request.getRequestURI() + " with originalRemoteAddr '" + request.getRemoteAddr() + "'"); } } diff --git a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java index b0e9457059..462c568e3b 100644 --- a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java +++ b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java @@ -128,8 +128,8 @@ public class StuckThreadDetectionValve extends ValveBase { protected void initInternal() throws LifecycleException { super.initInternal(); - if (log.isDebugEnabled()) { - log.debug("Monitoring stuck threads with threshold = " + threshold + " sec"); + if (log.isTraceEnabled()) { + log.trace("Monitoring stuck threads with threshold = " + threshold + " sec"); } } diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java b/java/org/apache/catalina/valves/rewrite/RewriteValve.java index 61abc09e18..356c4b03b2 100644 --- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java +++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java @@ -221,8 +221,8 @@ public class RewriteValve extends ValveBase { Object result = parse(line); if (result instanceof RewriteRule) { RewriteRule rule = (RewriteRule) result; - if (containerLog.isDebugEnabled()) { - containerLog.debug("Add rule with pattern " + rule.getPatternString() + if (containerLog.isTraceEnabled()) { + containerLog.trace("Add rule with pattern " + rule.getPatternString() + " and substitution " + rule.getSubstitutionString()); } for (int i = (conditions.size() - 1); i > 0; i--) { @@ -231,9 +231,9 @@ public class RewriteValve extends ValveBase { } } for (RewriteCond condition : conditions) { - if (containerLog.isDebugEnabled()) { + if (containerLog.isTraceEnabled()) { RewriteCond cond = condition; - containerLog.debug("Add condition " + cond.getCondPattern() + containerLog.trace("Add condition " + cond.getCondPattern() + " test " + cond.getTestString() + " to rule with pattern " + rule.getPatternString() + " and substitution " + rule.getSubstitutionString() + (cond.isOrnext() ? " [OR]" : "") @@ -323,8 +323,8 @@ public class RewriteValve extends ValveBase { CharSequence test = (rule.isHost()) ? host : urlDecoded; CharSequence newtest = rule.evaluate(test, resolver); if (newtest != null && !test.equals(newtest.toString())) { - if (containerLog.isDebugEnabled()) { - containerLog.debug("Rewrote " + test + " as " + newtest + if (containerLog.isTraceEnabled()) { + containerLog.trace("Rewrote " + test + " as " + newtest + " with rule pattern " + rule.getPatternString()); } if (rule.isHost()) { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9f72fb2e1c..61628df9f6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,6 +122,10 @@ Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. (schultz) </add> + <fix> + Review usage of debug logging and downgrade trace or data dumping + operations from debug level to trace. (remm) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org