(tomcat) branch main updated: Differentiate trace and debug log levels
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 8df28a289a Differentiate trace and debug log levels
8df28a289a is described below
commit 8df28a289a8080d640f4b08019f87b02ec8e29d6
Author: remm
AuthorDate: Tue Feb 6 11:51:57 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/jasper/compiler/AntCompiler.java | 8 +--
java/org/apache/jasper/compiler/Compiler.java | 16 +++---
.../apache/jasper/compiler/JspRuntimeContext.java | 22
java/org/apache/jasper/compiler/SmapUtil.java | 60 +++---
.../optimizations/ELInterpreterTagSetters.java | 4 +-
java/org/apache/jasper/servlet/JspServlet.java | 18 +++
java/org/apache/jasper/servlet/TldScanner.java | 24 -
java/org/apache/tomcat/websocket/WsFrameBase.java | 4 +-
java/org/apache/tomcat/websocket/WsSession.java| 12 ++---
.../tomcat/websocket/WsWebSocketContainer.java | 8 +--
.../tomcat/websocket/server/WsFrameServer.java | 8 +--
webapps/docs/changelog.xml | 8 +++
12 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/java/org/apache/jasper/compiler/AntCompiler.java
b/java/org/apache/jasper/compiler/AntCompiler.java
index bbd6d7c2a4..b615c2395f 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -81,8 +81,8 @@ public class AntCompiler extends Compiler {
}
if( options.getCompiler() != null ) {
-if( log.isDebugEnabled() ) {
-log.debug("Compiler " + options.getCompiler() );
+if( log.isTraceEnabled() ) {
+log.trace("Compiler " + options.getCompiler() );
}
project.setProperty("build.compiler", options.getCompiler() );
}
@@ -157,8 +157,8 @@ public class AntCompiler extends Compiler {
info.append("cp=" + repository + "\n");
}
-if (log.isDebugEnabled()) {
-log.debug( "Using classpath: " +
System.getProperty("java.class.path") +
+if (log.isTraceEnabled()) {
+log.trace( "Using classpath: " +
System.getProperty("java.class.path") +
File.pathSeparator + classpath);
}
diff --git a/java/org/apache/jasper/compiler/Compiler.java
b/java/org/apache/jasper/compiler/Compiler.java
index 6dca35c4a3..89f11919cc 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -267,9 +267,9 @@ public abstract class Compiler {
// to be GC'd and save memory.
ctxt.setWriter(null);
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
t4 = System.currentTimeMillis();
-log.debug("Generated " + javaFileName + " total=" + (t4 - t1)
+log.trace("Generated " + javaFileName + " total=" + (t4 - t1)
+ " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
}
@@ -494,8 +494,8 @@ public abstract class Compiler {
}
if (targetLastModified != jspRealLastModified.longValue()) {
-if (log.isDebugEnabled()) {
-log.debug("Compiler: outdated: " + targetFile + " "
+if (log.isTraceEnabled()) {
+log.trace("Compiler: outdated: " + targetFile + " "
+ targetLastModified);
}
return true;
@@ -585,8 +585,8 @@ public abstract class Compiler {
try {
File javaFile = new File(ctxt.getServletJavaFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + javaFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + javaFile);
}
if (javaFile.exists()) {
if (!javaFile.delete()) {
@@ -605,8 +605,8 @@ public abstract class Compiler {
public void removeGeneratedClassFiles() {
try {
File classFile = new File(ctxt.getClassFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + classFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + classFile);
}
if (classFile.exists()) {
if (!classFile.delete()) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index ed11a2d9f4..9f3b69c6ae 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -89,12 +89,12 @@ public final class JspRuntimeContext {
loader = this.getClass().getClassLoader();
}
-if (log.isDebugEnabl
(tomcat) branch main updated: Differentiate trace and debug log levels
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 1532c4f51c Differentiate trace and debug log levels
1532c4f51c is described below
commit 1532c4f51c5cdaf603e984146c8391dcac1507b7
Author: remm
AuthorDate: Tue Feb 6 11:08:42 2024 +0100
Differentiate trace and debug log levels
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 ++--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 40
java/org/apache/tomcat/util/net/NioEndpoint.java | 54 +++---
.../apache/tomcat/util/net/SecureNio2Channel.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 4 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 8 ++--
.../tomcat/util/net/openssl/OpenSSLContext.java| 28 +--
.../util/net/openssl/panama/OpenSSLContext.java| 36 +++
.../util/net/openssl/panama/OpenSSLEngine.java | 12 ++---
9 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 29cbef3b80..dfc0eb65f9 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1263,12 +1263,12 @@ public abstract class AbstractEndpoint {
// That causes delays when running the unit tests. Explicitly
enableing linger but with a timeout of
// zero seconds seems to fix the issue.
s.setSoLinger(true, 0);
-if (getLog().isDebugEnabled()) {
-getLog().debug("About to unlock socket for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("About to unlock socket for:" +
unlockAddress);
}
s.connect(unlockAddress,utmo);
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket unlock completed for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket unlock completed for:" +
unlockAddress);
}
}
// Wait for up to 1000ms acceptor threads to unlock. Particularly
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 9a8d2fd134..8f831fd70e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -611,8 +611,8 @@ public class Nio2Endpoint extends
AbstractNetworkChannelEndpoint() {
@Override
public void completed(Integer nBytes, ByteBuffer attachment) {
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
}
boolean notify = false;
synchronized (readCompletionHandler) {
@@ -824,8 +824,8 @@ public class Nio2Endpoint extends
AbstractNetworkChannelEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
}
// Fill as much of the remaining byte array as possible
with the
// data that was just read
@@ -962,8 +962,8 @@ public class Nio2Endpoint extends
AbstractNetworkChannelEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
update
(tomcat) branch main updated: Differentiate trace and debug log levels
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 db6afcd8ff Differentiate trace and debug log levels
db6afcd8ff is described below
commit db6afcd8ff831066495f65db53af84375de675a1
Author: remm
AuthorDate: Tue Feb 6 10:11:26 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/naming/SelectorContext.java| 32
.../org/apache/tomcat/util/IntrospectionUtils.java | 36 -
.../org/apache/tomcat/util/LocalStrings.properties | 2 +
.../util/descriptor/web/LocalStrings.properties| 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 43 +-
.../tomcat/util/digester/CallMethodRule.java | 4 +-
.../apache/tomcat/util/digester/CallParamRule.java | 4 +-
java/org/apache/tomcat/util/digester/Digester.java | 92 +++---
.../tomcat/util/digester/FactoryCreateRule.java| 12 +--
.../tomcat/util/digester/ObjectCreateRule.java | 4 +-
.../apache/tomcat/util/digester/SetNextRule.java | 6 +-
.../tomcat/util/digester/SetPropertiesRule.java| 8 +-
java/org/apache/tomcat/util/http/Parameters.java | 16 ++--
.../tomcat/util/http/Rfc6265CookieProcessor.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 28 +++
java/org/apache/tomcat/util/modeler/Registry.java | 16 ++--
.../MbeansDescriptorsIntrospectionSource.java | 24 +++---
.../org/apache/tomcat/util/threads/LimitLatch.java | 8 +-
18 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/java/org/apache/naming/SelectorContext.java
b/java/org/apache/naming/SelectorContext.java
index 66dee29777..3675b4e1e4 100644
--- a/java/org/apache/naming/SelectorContext.java
+++ b/java/org/apache/naming/SelectorContext.java
@@ -127,8 +127,8 @@ public class SelectorContext implements Context {
public Object lookup(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "lookup",
name));
}
@@ -150,8 +150,8 @@ public class SelectorContext implements Context {
public Object lookup(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
"lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"lookup",
name));
}
@@ -327,8 +327,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "list",
name));
}
@@ -349,8 +349,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString", "list",
name));
}
@@ -375,8 +375,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"listBindings", name));
}
@@ -397,8 +397,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"listBindings", name));
}
@@ -507,8 +507,8 @@ public class SelectorContext implements Context {
public Object lookupLink(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"lookupLink", name));
}
@@ -529,8 +529,8 @@ public class SelectorContext implements Context {
public Objec
(tomcat) branch main updated: Differentiate trace and debug log levels
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 a25e27cf57 Differentiate trace and debug log levels
a25e27cf57 is described below
commit a25e27cf5784afeeaf8a650033edbef1b7aac1c2
Author: remm
AuthorDate: Mon Feb 5 15:22:59 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProcessorLight.java | 12 +--
java/org/apache/coyote/AbstractProtocol.java | 44 +--
java/org/apache/coyote/AsyncStateMachine.java | 12 +--
java/org/apache/coyote/ajp/AjpMessage.java | 14 ++--
.../coyote/http11/filters/GzipOutputFilter.java| 4 +-
.../http11/upgrade/UpgradeProcessorExternal.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 12 +--
.../coyote/http2/ConnectionSettingsBase.java | 4 +-
java/org/apache/coyote/http2/HpackDecoder.java | 20 ++---
java/org/apache/coyote/http2/HpackEncoder.java | 4 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 32
java/org/apache/coyote/http2/Http2Parser.java | 24 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 92 +++---
java/org/apache/coyote/http2/Stream.java | 40 +-
java/org/apache/coyote/http2/StreamProcessor.java | 4 +-
.../apache/coyote/http2/StreamStateMachine.java| 4 +-
webapps/docs/changelog.xml | 5 ++
18 files changed, 172 insertions(+), 167 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index 6cb85ffee6..38ad35fec0 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -264,8 +264,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
state = dispatchEndRequest();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
return state;
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java
b/java/org/apache/coyote/AbstractProcessorLight.java
index 5a60dd2a54..2a429e7b1b 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -44,8 +44,8 @@ public abstract class AbstractProcessorLight implements
Processor {
do {
if (dispatches != null) {
DispatchType nextDispatch = dispatches.next();
-if (getLog().isDebugEnabled()) {
-getLog().debug("Processing dispatch type: [" +
nextDispatch + "]");
+if (getLog().isTraceEnabled()) {
+getLog().trace("Processing dispatch type: [" +
nextDispatch + "]");
}
state = dispatch(nextDispatch.getSocketStatus());
if (!dispatches.hasNext()) {
@@ -69,8 +69,8 @@ public abstract class AbstractProcessorLight implements
Processor {
state = SocketState.CLOSED;
}
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], Status in: [" +
status + "], State out: [" + state + "]");
}
@@ -81,8 +81,8 @@ public abstract class AbstractProcessorLight implements
Processor {
*/
if (isAsync() && state != SocketState.CLOSED) {
state = asyncPostProcess();
-if (getLog().isDebugEnabled()) {
-getLog().debug(
+if (getLog().isTraceEnabled()) {
+getLog().trace(
"Socket: [" + socketWrapper + "], State after
async post processing: [" + state + "]");
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 5e208ce45b..832eafee56 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -428,16 +428,16 @@ public abstract class AbstractProtocol implements
ProtocolHandler, MBeanRegis
public void addWaitingProcessor(Processor processor) {
-if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
+if (getLog().isTraceEnabled()) {
+
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.add",
processor));
(tomcat) branch main updated: Differentiate trace and debug log levels
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 d75334e8c3 Differentiate trace and debug log levels
d75334e8c3 is described below
commit d75334e8c3734b53b879cff395c5474321c9baba
Author: remm
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=" +
clientIdentif
(tomcat) branch main updated: Differentiate trace and debug log levels
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 eaff01e9d1 Differentiate trace and debug log levels
eaff01e9d1 is described below
commit eaff01e9d14884a520691ee4b1af2fe330cb46a2
Author: remm
AuthorDate: Mon Feb 5 09:53:34 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/session/DataSourceStore.java | 12 +++---
java/org/apache/catalina/session/FileStore.java| 12 +++---
java/org/apache/catalina/session/ManagerBase.java | 8 ++--
.../catalina/session/PersistentManagerBase.java| 28 +++---
.../apache/catalina/session/StandardManager.java | 36 +-
.../apache/catalina/session/StandardSession.java | 16
java/org/apache/catalina/session/StoreBase.java| 8 ++--
java/org/apache/catalina/startup/Bootstrap.java| 12 +++---
java/org/apache/catalina/startup/Catalina.java | 4 +-
.../catalina/startup/ClassLoaderFactory.java | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 44 +++---
java/org/apache/catalina/startup/EngineConfig.java | 8 ++--
java/org/apache/catalina/startup/HostConfig.java | 24 ++--
java/org/apache/catalina/startup/Tool.java | 8 ++--
java/org/apache/catalina/startup/UserConfig.java | 4 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 4 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 4 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 13 +++
.../org/apache/catalina/storeconfig/ManagerSF.java | 4 +-
.../catalina/storeconfig/NamingResourcesSF.java| 5 +--
java/org/apache/catalina/storeconfig/RealmSF.java | 4 +-
.../catalina/storeconfig/StandardServerSF.java | 14 ---
.../catalina/storeconfig/StoreFactoryBase.java | 4 +-
.../apache/catalina/storeconfig/StoreRegistry.java | 10 ++---
.../catalina/storeconfig/WatchedResourceSF.java| 5 +--
.../catalina/storeconfig/WrapperLifecycleSF.java | 5 +--
.../catalina/storeconfig/WrapperListenerSF.java| 4 +-
28 files changed, 153 insertions(+), 171 deletions(-)
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 86d29f3c4f..c00d98bd4a 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -826,22 +826,22 @@ public final class CGIServlet extends HttpServlet {
webAppRootDir = webAppRootDir + File.separator + cgiPathPrefix;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.path", pathInfo,
webAppRootDir));
}
File currentLocation = new File(webAppRootDir);
StringTokenizer dirWalker = new StringTokenizer(pathInfo, "/");
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
StringBuilder cginameBuilder = new StringBuilder();
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
String nextElement = (String) dirWalker.nextElement();
currentLocation = new File(currentLocation, nextElement);
cginameBuilder.append('/').append(nextElement);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.location",
currentLocation.getAbsolutePath()));
}
}
String cginame = cginameBuilder.toString();
@@ -858,8 +858,8 @@ public final class CGIServlet extends HttpServlet {
scriptname = contextPath + servletPath + cginame;
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("cgiServlet.find.found", name, path,
scriptname, cginame));
}
return new String[] { path, scriptname, cginame, name };
}
@@ -1441,8 +1441,8 @@ public final class CGIServlet extends HttpServlet {
throw new IOException(this.getClass().getName() + ": not ready
to run.");
}
-if (log.isDebugEn
(tomcat) branch main updated: Differentiate trace and debug log levels
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 ec96773985 Differentiate trace and debug log levels
ec96773985 is described below
commit ec96773985a374d320cf75679fd5a753e25e12b7
Author: remm
AuthorDate: Fri Feb 2 22:14:39 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/mapper/Mapper.java| 4 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 26 ++---
java/org/apache/catalina/realm/CombinedRealm.java | 74 ++---
.../catalina/realm/JAASMemoryLoginModule.java | 16 +--
java/org/apache/catalina/realm/JAASRealm.java | 34 +++---
java/org/apache/catalina/realm/JNDIRealm.java | 32 +++---
java/org/apache/catalina/realm/MemoryRealm.java| 4 +-
java/org/apache/catalina/realm/RealmBase.java | 114 ++---
8 files changed, 154 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index 40c214fd87..c07c6c12ff 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -520,8 +520,8 @@ public final class Mapper {
protected void removeWrapper(ContextVersion context, String path) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("mapper.removeWrapper", context.name,
path));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("mapper.removeWrapper", context.name,
path));
}
synchronized (context) {
diff --git
a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index c688b6e515..feba89cf8e 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -130,8 +130,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Binding binding = bindings.next();
String name = prefix + binding.getName();
Object value = context.lookup(binding.getName());
-if (log.isDebugEnabled()) {
-log.debug("Checking resource " + name);
+if (log.isTraceEnabled()) {
+log.trace("Checking resource " + name);
}
if (value instanceof Context) {
createMBeans(name + "/", (Context) value);
@@ -162,9 +162,9 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
protected void createMBeans(String name, UserDatabase database) throws
Exception {
// Create the MBean for the UserDatabase itself
-if (log.isDebugEnabled()) {
-log.debug("Creating UserDatabase MBeans for resource " + name);
-log.debug("Database=" + database);
+if (log.isTraceEnabled()) {
+log.trace("Creating UserDatabase MBeans for resource " + name);
+log.trace("Database=" + database);
}
try {
MBeanUtils.createMBean(database);
@@ -181,8 +181,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator roles = database.getRoles();
while (roles.hasNext()) {
Role role = roles.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Role MBean for role " + role);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Role MBean for role " + role);
}
try {
MBeanUtils.createMBean(role);
@@ -196,8 +196,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator groups = database.getGroups();
while (groups.hasNext()) {
Group group = groups.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Group MBean for group " + group);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Group MBean for group " + group);
}
try {
MBeanUtils.createMBean(group);
@@ -211,8 +211,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating User MBean for user " + user);
+if (log.isTraceEnabled()) {
+log.trace(" Creating User MBean for user " + user);
}
try {
MBeanUtils.createMBean(user);
@@ -228,8 +228,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListen
(tomcat) branch main updated: Differentiate trace and debug log levels
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 2c7bda3c2d Differentiate trace and debug log levels
2c7bda3c2d is described below
commit 2c7bda3c2ded4efe3b8871c0a399351d15fe53d7
Author: remm
AuthorDate: Fri Feb 2 16:47:55 2024 +0100
Differentiate trace and debug log levels
---
.../org/apache/catalina/filters/ExpiresFilter.java | 4 +-
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 6 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 32 +++---
.../catalina/ha/deploy/FileMessageFactory.java | 8 +-
.../apache/catalina/ha/session/BackupManager.java | 8 +-
.../apache/catalina/ha/session/DeltaManager.java | 25 +++--
.../catalina/ha/session/JvmRouteBinderValve.java | 6 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 20 ++--
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 12 +-
.../catalina/loader/WebappClassLoaderBase.java | 122 ++---
12 files changed, 129 insertions(+), 126 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 7fbb6529aa..fe80faa521 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1383,7 +1383,9 @@ public class ExpiresFilter extends FilterBase {
}
}
-log.debug(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+}
}
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index a0f5bf0f04..e7766c74d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -61,6 +61,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidPort=Port [{0}] in HTTP header [{1}] included a port
number which will be ignored
remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 038f4a95b7..0e3a3e74df 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -862,8 +862,8 @@ public class RemoteIpFilter extends GenericFilter {
}
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 [" +
request.getRemoteAddr() + "], originalRemoteHost=[" +
request.getRemoteHost() +
"], originalSecure=[" + request.isSecure() + "],
originalScheme=[" + request.getScheme() +
"], originalServerName=[" + request.getServerName() +
"], originalServerPort=[" +
@@ -882,8 +882,8 @@ public class RemoteIpFilter extends GenericFilter {
}
chain.doFilter(xRequest, response);
} else {
-if (log.isDebugEnabled()) {
-log.debug("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
+if (log.isTraceEnabled()) {
+log.trace("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
request.getRemoteAddr() + "'");
}
chain.doFilter(request, response);
@@ -918,8 +918,7 @@ public class RemoteIpFilter extends GenericFilter {
try {
port = Integer.parseInt(portHeaderValue);
} catch (NumberFormatException nfe) {
-log.debug("Invalid port value [" + portHeaderValue + "]
provided in header [" + getPortHeader() +
-"]");
+log.debug(sm.getString("remoteIpFilter.i
(tomcat) branch main updated: Differentiate trace and debug log levels
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 56bbdd6ac9 Differentiate trace and debug log levels
56bbdd6ac9 is described below
commit 56bbdd6ac9c2ee690e33b2e6ceb97d4dbf0d7ad6
Author: remm
AuthorDate: Fri Feb 2 13:51:40 2024 +0100
Differentiate trace and debug log levels
---
.../catalina/core/ApplicationDispatcher.java | 8 +--
.../org/apache/catalina/core/AsyncContextImpl.java | 28 +-
.../apache/catalina/core/LocalStrings.properties | 3 +-
.../catalina/core/NamingContextListener.java | 4 +-
java/org/apache/catalina/core/StandardContext.java | 64 +++---
.../apache/catalina/core/StandardHostValve.java| 14 ++---
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index ebc5111ecd..0707cf8eb3 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -291,8 +291,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
// This is not a real close in order to support error processing
-if (wrapper.getLogger().isDebugEnabled()) {
-wrapper.getLogger().debug(" Disabling the response for further
output");
+if (wrapper.getLogger().isTraceEnabled()) {
+wrapper.getLogger().trace(" Disabling the response for further
output");
}
if (response instanceof ResponseFacade) {
@@ -300,9 +300,9 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
// and may no longer be instance of RequestFacade
-if (wrapper.getLogger().isDebugEnabled()) {
+if (wrapper.getLogger().isTraceEnabled()) {
wrapper.getLogger()
-.debug(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
+.trace(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
}
// Close anyway
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index ae41532aca..832e9b61bc 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -77,7 +77,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
private final AtomicBoolean hasOnErrorReturned = new AtomicBoolean(false);
public AsyncContextImpl(Request request) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("Constructor");
}
this.request = request;
@@ -85,7 +85,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void complete() {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("complete ");
}
check();
@@ -94,8 +94,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void fireOnComplete() {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnComplete"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnComplete"));
}
List listenersCopy = new ArrayList<>(listeners);
@@ -124,8 +124,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
Context context = this.context;
if (result.get()) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnTimeout"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnTimeout"));
}
ClassLoader oldCL = context.bind(null);
try {
@@ -178,7 +178,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void dispatch(ServletContext servletContext, String path) {
synchronized (asyncContextLock) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("dispatch ");
}
check();
@@ -225,7 +225,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void start(final Runnable run) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
(tomcat) branch main updated: Differentiate trace and debug log levels
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 fa475b419f Differentiate trace and debug log levels
fa475b419f is described below
commit fa475b419f229c5e72ab112d919de37246af4792
Author: remm
AuthorDate: Fri Feb 2 11:11:57 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/connector/CoyoteAdapter.java | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index f252a4a0f6..bfd3f6f56b 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -900,10 +900,10 @@ public class CoyoteAdapter implements Adapter {
// encoding that doesn't give the expected result so be explicit
Charset charset = connector.getURICharset();
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
-log.debug(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
-log.debug(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
+log.trace(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
+log.trace(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
}
while (semicolon > -1) {
@@ -934,10 +934,10 @@ public class CoyoteAdapter implements Adapter {
uriBC.setEnd(start + semicolon);
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
-log.debug(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
-log.debug(sm.getString("coyoteAdapter.debug", "pv", pv));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
+log.trace(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
+log.trace(sm.getString("coyoteAdapter.debug", "pv", pv));
}
if (pv != null) {
@@ -946,10 +946,10 @@ public class CoyoteAdapter implements Adapter {
String name = pv.substring(0, equals);
String value = pv.substring(equals + 1);
request.addPathParameter(name, value);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
-log.debug(sm.getString("coyoteAdapter.debug", "name",
name));
-log.debug(sm.getString("coyoteAdapter.debug", "value",
value));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
+log.trace(sm.getString("coyoteAdapter.debug", "name",
name));
+log.trace(sm.getString("coyoteAdapter.debug", "value",
value));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Differentiate trace and debug log levels
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 f75aa51afd Differentiate trace and debug log levels
f75aa51afd is described below
commit f75aa51afd4a1ce3ba736d6018cddf3c5ee4b78f
Author: remm
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 84856f1f38..b6604d4b9e 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -498,8 +498,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()) {
@@ -549,8 +549,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) {
@@ -575,8 +575,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()) {
@@ -591,8 +591,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 78d97b967a..813b37eea9 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
