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 <r...@apache.org>
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.invalidPort",
portHeaderValue, getPortHeader()));
}
}
}
diff --git a/java/org/apache/catalina/ha/ClusterListener.java
b/java/org/apache/catalina/ha/ClusterListener.java
index c3cbfe0be4..0206cbbf69 100644
--- a/java/org/apache/catalina/ha/ClusterListener.java
+++ b/java/org/apache/catalina/ha/ClusterListener.java
@@ -54,11 +54,11 @@ public abstract class ClusterListener implements
ChannelListener {
}
public void setCluster(CatalinaCluster cluster) {
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
if (cluster != null) {
- log.debug("add ClusterListener " + this.toString() + " to
cluster" + cluster);
+ log.trace("add ClusterListener " + this.toString() + " to
cluster" + cluster);
} else {
- log.debug("remove ClusterListener " + this.toString() + " from
cluster");
+ log.trace("remove ClusterListener " + this.toString() + " from
cluster");
}
}
this.cluster = cluster;
diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
index 16e821c282..f0d6567a64 100644
--- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
+++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
@@ -208,8 +208,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
try {
if (msg instanceof FileMessage) {
FileMessage fmsg = (FileMessage) msg;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("farmWarDeployer.msgRxDeploy",
fmsg.getContextName(), fmsg.getFileName()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("farmWarDeployer.msgRxDeploy",
fmsg.getContextName(), fmsg.getFileName()));
}
FileMessageFactory factory = getFactory(fmsg);
// TODO correct second try after app is in service!
@@ -233,8 +233,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
removeServiced(contextName);
}
check(contextName);
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("farmWarDeployer.deployEnd", contextName));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("farmWarDeployer.deployEnd", contextName));
}
} else {
log.error(sm.getString("farmWarDeployer.servicingDeploy", contextName, name));
@@ -249,8 +249,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
try {
UndeployMessage umsg = (UndeployMessage) msg;
String contextName = umsg.getContextName();
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("farmWarDeployer.msgRxUndeploy", contextName));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("farmWarDeployer.msgRxUndeploy", contextName));
}
if (tryAddServiced(contextName)) {
try {
@@ -258,8 +258,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
} finally {
removeServiced(contextName);
}
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("farmWarDeployer.undeployEnd", contextName));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("farmWarDeployer.undeployEnd", contextName));
}
} else {
log.error(sm.getString("farmWarDeployer.servicingUndeploy", contextName));
@@ -341,21 +341,21 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
Member localMember = getCluster().getLocalMember();
FileMessageFactory factory = FileMessageFactory.getInstance(webapp,
false);
FileMessage msg = new FileMessage(localMember, webapp.getName(),
contextName);
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("farmWarDeployer.sendStart", contextName,
webapp));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("farmWarDeployer.sendStart", contextName,
webapp));
}
msg = factory.readMessage(msg);
while (msg != null) {
for (Member member : members) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("farmWarDeployer.sendFragment",
contextName, webapp, member));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("farmWarDeployer.sendFragment",
contextName, webapp, member));
}
getCluster().send(msg, member);
}
msg = factory.readMessage(msg);
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("farmWarDeployer.sendEnd", contextName,
webapp));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("farmWarDeployer.sendEnd", contextName,
webapp));
}
}
@@ -382,8 +382,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
Member localMember = getCluster().getLocalMember();
UndeployMessage msg = new UndeployMessage(localMember,
System.currentTimeMillis(),
"Undeploy:" + contextName + ":" +
System.currentTimeMillis(), contextName);
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("farmWarDeployer.removeTxMsg",
contextName));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("farmWarDeployer.removeTxMsg",
contextName));
}
cluster.send(msg);
}
diff --git a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
index d0c8f46fd0..43bf06d7c2 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
@@ -134,8 +134,8 @@ public class FileMessageFactory {
private FileMessageFactory(File f, boolean openForWrite) throws
FileNotFoundException, IOException {
this.file = f;
this.openForWrite = openForWrite;
- if (log.isDebugEnabled()) {
- log.debug("open file " + f + " write " + openForWrite);
+ if (log.isTraceEnabled()) {
+ log.trace("FileMessageFactory open file " + f + " write " +
openForWrite);
}
if (openForWrite) {
if (!file.exists()) {
@@ -211,8 +211,8 @@ public class FileMessageFactory {
if (!openForWrite) {
throw new
IllegalArgumentException(sm.getString("fileMessageFactory.cannotWrite"));
}
- if (log.isDebugEnabled()) {
- log.debug("Message " + msg + " data " +
HexUtils.toHexString(msg.getData()) + " data length " +
+ if (log.isTraceEnabled()) {
+ log.trace("Message " + msg + " data " +
HexUtils.toHexString(msg.getData()) + " data length " +
msg.getDataLength() + " out " + out);
}
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java
b/java/org/apache/catalina/ha/session/BackupManager.java
index 095fbc9c4c..ce02baaafc 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -154,8 +154,8 @@ public class BackupManager extends ClusterManagerBase
implements MapOwner, Distr
public String getMapName() {
String name = cluster.getManagerName(getName(), this) + "-" + "map";
- if (log.isDebugEnabled()) {
- log.debug("Backup manager, Setting map name to:" + name);
+ if (log.isTraceEnabled()) {
+ log.trace("Backup manager, Setting map name to:" + name);
}
return name;
}
@@ -172,8 +172,8 @@ public class BackupManager extends ClusterManagerBase
implements MapOwner, Distr
@Override
protected void stopInternal() throws LifecycleException {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("backupManager.stopped", getName()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("backupManager.stopped", getName()));
}
setState(LifecycleState.STOPPING);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 3c0025022c..739107e1f9 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -427,8 +427,8 @@ public class DeltaManager extends ClusterManagerBase {
if (cluster.getMembers().length > 0) {
SessionMessage msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_CREATED, null, sessionId,
sessionId + "-" + System.currentTimeMillis());
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("deltaManager.sendMessage.newSession",
name, sessionId));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("deltaManager.sendMessage.newSession",
name, sessionId));
}
msg.setTimestamp(session.getCreationTime());
counterSend_EVT_SESSION_CREATED++;
@@ -744,8 +744,8 @@ public class DeltaManager extends ClusterManagerBase {
if (mbr == null && log.isWarnEnabled()) {
log.warn(sm.getString("deltaManager.noMasterMember", getName(),
""));
}
- if (mbr != null && log.isDebugEnabled()) {
- log.debug(sm.getString("deltaManager.foundMasterMember",
getName(), mbr));
+ if (mbr != null && log.isTraceEnabled()) {
+ log.trace(sm.getString("deltaManager.foundMasterMember",
getName(), mbr));
}
return mbr;
}
@@ -1021,13 +1021,14 @@ public class DeltaManager extends ClusterManagerBase {
* Expire all find sessions.
*/
public void expireAllLocalSessions() {
- long timeNow = System.currentTimeMillis();
Session sessions[] = findSessions();
int expireDirect = 0;
int expireIndirect = 0;
- if (log.isDebugEnabled()) {
- log.debug("Start expire all sessions " + getName() + " at " +
timeNow + " sessioncount " + sessions.length);
+ long timeNow = 0;
+ if (log.isTraceEnabled()) {
+ timeNow = System.currentTimeMillis();
+ log.trace("Start expire all sessions " + getName() + " at " +
timeNow + " sessioncount " + sessions.length);
}
for (Session value : sessions) {
if (value instanceof DeltaSession) {
@@ -1042,9 +1043,9 @@ public class DeltaManager extends ClusterManagerBase {
} // end if
} // end if
} // for
- long timeEnd = System.currentTimeMillis();
- if (log.isDebugEnabled()) {
- log.debug("End expire sessions " + getName() + " expire
processingTime " + (timeEnd - timeNow) +
+ if (log.isTraceEnabled()) {
+ long timeEnd = System.currentTimeMillis();
+ log.trace("End expire sessions " + getName() + " expire
processingTime " + (timeEnd - timeNow) +
" expired direct sessions: " + expireDirect + " expired
direct sessions: " + expireIndirect);
}
}
@@ -1071,8 +1072,8 @@ public class DeltaManager extends ClusterManagerBase {
ClassLoader[] loaders = getClassLoaders();
currentThread.setContextClassLoader(loaders[0]);
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.receiveMessage.eventType", getName(),
msg.getEventTypeString(),
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("deltaManager.receiveMessage.eventType", getName(),
msg.getEventTypeString(),
sender));
}
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 69242b392b..174284614d 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -184,10 +184,10 @@ public class JvmRouteBinderValve extends ValveBase
implements ClusterValve {
return;
}
handleJvmRoute(request, sessionID, jvmRoute);
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
long t2 = System.currentTimeMillis();
long time = t2 - t1;
- log.debug(sm.getString("jvmRoute.turnoverInfo",
Long.valueOf(time)));
+ log.trace(sm.getString("jvmRoute.turnoverInfo",
Long.valueOf(time)));
}
}
}
@@ -218,7 +218,7 @@ public class JvmRouteBinderValve extends ValveBase
implements ClusterValve {
Manager manager = request.getContext().getManager();
if (log.isDebugEnabled()) {
if (manager != null) {
- log.debug(sm.getString("jvmRoute.foundManager", manager,
request.getContext().getName()));
+ log.trace(sm.getString("jvmRoute.foundManager", manager,
request.getContext().getName()));
} else {
log.debug(sm.getString("jvmRoute.notFoundManager",
request.getContext().getName()));
}
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 168b550bef..de419319ae 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -150,8 +150,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
* @param filter The filter to set.
*/
public void setFilter(String filter) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("ReplicationValve.filter.loading", filter));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("ReplicationValve.filter.loading", filter));
}
if (filter == null || filter.length() == 0) {
@@ -274,8 +274,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
List<DeltaSession> sessions = crossContextSessions.get();
if (sessions != null) {
if (!sessions.contains(session)) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("ReplicationValve.crossContext.registerSession",
session.getIdInternal(),
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("ReplicationValve.crossContext.registerSession",
session.getIdInternal(),
session.getManager().getContext().getName()));
}
sessions.add(session);
@@ -308,8 +308,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
boolean isCrossContext = context != null && context instanceof
StandardContext && context.getCrossContext();
try {
if (isCrossContext) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("ReplicationValve.crossContext.add"));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("ReplicationValve.crossContext.add"));
}
// FIXME add Pool of Arraylists
crossContextSessions.set(new ArrayList<>());
@@ -333,8 +333,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
// Array must be remove: Current master request send endAccess at
recycle.
// Don't register this request session again!
if (isCrossContext) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("ReplicationValve.crossContext.remove"));
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("ReplicationValve.crossContext.remove"));
}
crossContextSessions.remove();
}
@@ -461,8 +461,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
* @param session HttpSession from current request or cross context session
*/
protected void resetDeltaRequest(Session session) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("ReplicationValve.resetDeltaRequest",
session.getManager().getContext().getName()));
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("ReplicationValve.resetDeltaRequest",
session.getManager().getContext().getName()));
}
((DeltaSession) session).resetDeltaRequest();
}
diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index 23cf624538..01774e46c0 100644
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -596,8 +596,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
if (container != null) {
for (Valve v : valves) {
ClusterValve valve = (ClusterValve) v;
- if (log.isDebugEnabled()) {
- log.debug("Invoking addValve on " + getContainer() + "
with class=" + valve.getClass().getName());
+ if (log.isTraceEnabled()) {
+ log.trace("Invoking addValve on " + getContainer() + "
with class=" + valve.getClass().getName());
}
if (valve != null) {
container.getPipeline().addValve(valve);
@@ -613,8 +613,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
protected void unregisterClusterValve() {
for (Valve v : valves) {
ClusterValve valve = (ClusterValve) v;
- if (log.isDebugEnabled()) {
- log.debug("Invoking removeValve on " + getContainer() + " with
class=" + valve.getClass().getName());
+ if (log.isTraceEnabled()) {
+ log.trace("Invoking removeValve on " + getContainer() + " with
class=" + valve.getClass().getName());
}
if (valve != null) {
container.getPipeline().removeValve(valve);
@@ -796,8 +796,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
public void messageReceived(ClusterMessage message) {
- if (log.isDebugEnabled() && message != null) {
- log.debug("Assuming clocks are synched: Replication for " +
message.getUniqueId() + " took=" +
+ if (log.isTraceEnabled() && message != null) {
+ log.trace("Assuming clocks are synched: Replication for " +
message.getUniqueId() + " took=" +
(System.currentTimeMillis() - (message).getTimestamp()) +
" ms.");
}
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 7ba7fcf1e2..b2ca9de81b 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -573,8 +573,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
*/
public boolean modified() {
- if (log.isDebugEnabled()) {
- log.debug("modified()");
+ if (log.isTraceEnabled()) {
+ log.trace("modified()");
}
for (Entry<String,ResourceEntry> entry : resourceEntries.entrySet()) {
@@ -665,8 +665,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
@Override
public Class<?> findClass(String name) throws ClassNotFoundException {
- if (log.isDebugEnabled()) {
- log.debug(" findClass(" + name + ")");
+ if (log.isTraceEnabled()) {
+ log.trace(" findClass(" + name + ")");
}
checkStateForClassLoading(name);
@@ -697,8 +697,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
}
}
if (clazz == null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning ClassNotFoundException");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning ClassNotFoundException");
}
throw new ClassNotFoundException(name);
}
@@ -711,12 +711,12 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// Return the class we have located
if (log.isTraceEnabled()) {
- log.debug(" Returning class " + clazz);
+ log.trace(" Returning class " + clazz);
}
if (log.isTraceEnabled()) {
ClassLoader cl = clazz.getClassLoader();
- log.debug(" Loaded by " + cl.toString());
+ log.trace(" Loaded by " + cl.toString());
}
return clazz;
@@ -732,8 +732,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
@Override
public URL findResource(final String name) {
- if (log.isDebugEnabled()) {
- log.debug(" findResource(" + name + ")");
+ if (log.isTraceEnabled()) {
+ log.trace(" findResource(" + name + ")");
}
checkStateForResourceLoading(name);
@@ -752,11 +752,11 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
url = super.findResource(name);
}
- if (log.isDebugEnabled()) {
+ if (log.isTraceEnabled()) {
if (url != null) {
- log.debug(" --> Returning '" + url.toString() + "'");
+ log.trace(" --> Returning '" + url.toString() + "'");
} else {
- log.debug(" --> Resource not found, returning null");
+ log.trace(" --> Resource not found, returning null");
}
}
return url;
@@ -786,8 +786,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
@Override
public Enumeration<URL> findResources(String name) throws IOException {
- if (log.isDebugEnabled()) {
- log.debug(" findResources(" + name + ")");
+ if (log.isTraceEnabled()) {
+ log.trace(" findResources(" + name + ")");
}
checkStateForResourceLoading(name);
@@ -834,8 +834,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
@Override
public URL getResource(String name) {
- if (log.isDebugEnabled()) {
- log.debug("getResource(" + name + ")");
+ if (log.isTraceEnabled()) {
+ log.trace("getResource(" + name + ")");
}
checkStateForResourceLoading(name);
@@ -846,13 +846,13 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (1) Delegate to parent if requested
if (delegateFirst) {
- if (log.isDebugEnabled()) {
- log.debug(" Delegating to parent classloader " + parent);
+ if (log.isTraceEnabled()) {
+ log.trace(" Delegating to parent classloader " + parent);
}
url = parent.getResource(name);
if (url != null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning '" + url.toString() + "'");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning '" + url.toString() + "'");
}
return url;
}
@@ -861,8 +861,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (2) Search local repositories
url = findResource(name);
if (url != null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning '" + url.toString() + "'");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning '" + url.toString() + "'");
}
return url;
}
@@ -871,16 +871,16 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
if (!delegateFirst) {
url = parent.getResource(name);
if (url != null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning '" + url.toString() + "'");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning '" + url.toString() + "'");
}
return url;
}
}
// (4) Resource was not found
- if (log.isDebugEnabled()) {
- log.debug(" --> Resource not found, returning null");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Resource not found, returning null");
}
return null;
@@ -915,8 +915,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
@Override
public InputStream getResourceAsStream(String name) {
- if (log.isDebugEnabled()) {
- log.debug("getResourceAsStream(" + name + ")");
+ if (log.isTraceEnabled()) {
+ log.trace("getResourceAsStream(" + name + ")");
}
checkStateForResourceLoading(name);
@@ -927,21 +927,21 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (1) Delegate to parent if requested
if (delegateFirst) {
- if (log.isDebugEnabled()) {
- log.debug(" Delegating to parent classloader " + parent);
+ if (log.isTraceEnabled()) {
+ log.trace(" Delegating to parent classloader " + parent);
}
stream = parent.getResourceAsStream(name);
if (stream != null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning stream from parent");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning stream from parent");
}
return stream;
}
}
// (2) Search local repositories
- if (log.isDebugEnabled()) {
- log.debug(" Searching local repositories");
+ if (log.isTraceEnabled()) {
+ log.trace(" Searching local repositories");
}
String path = nameToPath(name);
WebResource resource = resources.getClassLoaderResource(path);
@@ -994,29 +994,29 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// Ignore
}
if (stream != null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning stream from local");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning stream from local");
}
return stream;
}
// (3) Delegate to parent unconditionally
if (!delegateFirst) {
- if (log.isDebugEnabled()) {
- log.debug(" Delegating to parent classloader unconditionally
" + parent);
+ if (log.isTraceEnabled()) {
+ log.trace(" Delegating to parent classloader unconditionally
" + parent);
}
stream = parent.getResourceAsStream(name);
if (stream != null) {
- if (log.isDebugEnabled()) {
- log.debug(" --> Returning stream from parent");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Returning stream from parent");
}
return stream;
}
}
// (4) Resource was not found
- if (log.isDebugEnabled()) {
- log.debug(" --> Resource not found, returning null");
+ if (log.isTraceEnabled()) {
+ log.trace(" --> Resource not found, returning null");
}
return null;
}
@@ -1059,8 +1059,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
public Class<?> loadClass(String name, boolean resolve) throws
ClassNotFoundException {
synchronized (JreCompat.isGraalAvailable() ? this :
getClassLoadingLock(name)) {
- if (log.isDebugEnabled()) {
- log.debug("loadClass(" + name + ", " + resolve + ")");
+ if (log.isTraceEnabled()) {
+ log.trace("loadClass(" + name + ", " + resolve + ")");
}
Class<?> clazz = null;
@@ -1070,8 +1070,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (0) Check our previously loaded local class cache
clazz = findLoadedClass0(name);
if (clazz != null) {
- if (log.isDebugEnabled()) {
- log.debug(" Returning class from cache");
+ if (log.isTraceEnabled()) {
+ log.trace(" Returning class from cache");
}
if (resolve) {
resolveClass(clazz);
@@ -1082,8 +1082,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (0.1) Check our previously loaded class cache
clazz = JreCompat.isGraalAvailable() ? null :
findLoadedClass(name);
if (clazz != null) {
- if (log.isDebugEnabled()) {
- log.debug(" Returning class from cache");
+ if (log.isTraceEnabled()) {
+ log.trace(" Returning class from cache");
}
if (resolve) {
resolveClass(clazz);
@@ -1138,14 +1138,14 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (1) Delegate to our parent if requested
if (delegateLoad) {
- if (log.isDebugEnabled()) {
- log.debug(" Delegating to parent classloader1 " + parent);
+ if (log.isTraceEnabled()) {
+ log.trace(" Delegating to parent classloader1 " + parent);
}
try {
clazz = Class.forName(name, false, parent);
if (clazz != null) {
- if (log.isDebugEnabled()) {
- log.debug(" Loading class from parent");
+ if (log.isTraceEnabled()) {
+ log.trace(" Loading class from parent");
}
if (resolve) {
resolveClass(clazz);
@@ -1158,14 +1158,14 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
}
// (2) Search local repositories
- if (log.isDebugEnabled()) {
- log.debug(" Searching local repositories");
+ if (log.isTraceEnabled()) {
+ log.trace(" Searching local repositories");
}
try {
clazz = findClass(name);
if (clazz != null) {
- if (log.isDebugEnabled()) {
- log.debug(" Loading class from local repository");
+ if (log.isTraceEnabled()) {
+ log.trace(" Loading class from local repository");
}
if (resolve) {
resolveClass(clazz);
@@ -1178,14 +1178,14 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// (3) Delegate to parent unconditionally
if (!delegateLoad) {
- if (log.isDebugEnabled()) {
- log.debug(" Delegating to parent classloader at end: " +
parent);
+ if (log.isTraceEnabled()) {
+ log.trace(" Delegating to parent classloader at end: " +
parent);
}
try {
clazz = Class.forName(name, false, parent);
if (clazz != null) {
- if (log.isDebugEnabled()) {
- log.debug(" Loading class from parent");
+ if (log.isTraceEnabled()) {
+ log.trace(" Loading class from parent");
}
if (resolve) {
resolveClass(clazz);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
