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 5efcb01a7f Differentiate trace and debug log levels 5efcb01a7f is described below commit 5efcb01a7feeb0ec1212248d56e594503e4575e5 Author: remm <r...@apache.org> 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 797f38ea34..30b2097b36 100644 --- a/java/org/apache/catalina/servlets/CGIServlet.java +++ b/java/org/apache/catalina/servlets/CGIServlet.java @@ -821,22 +821,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(); @@ -853,8 +853,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 }; } @@ -1436,8 +1436,8 @@ public final class CGIServlet extends HttpServlet { throw new IOException(this.getClass().getName() + ": not ready to run."); } - if (log.isDebugEnabled()) { - log.debug("envp: [" + env + "], command: [" + command + "]"); + if (log.isTraceEnabled()) { + log.trace("envp: [" + env + "], command: [" + command + "]"); } if ((command.contains(File.separator + "." + File.separator)) || diff --git a/java/org/apache/catalina/session/DataSourceStore.java b/java/org/apache/catalina/session/DataSourceStore.java index cbce1d3a3e..77f282ff62 100644 --- a/java/org/apache/catalina/session/DataSourceStore.java +++ b/java/org/apache/catalina/session/DataSourceStore.java @@ -451,8 +451,8 @@ public class DataSourceStore extends StoreBase { try (ResultSet rst = preparedLoadSql.executeQuery()) { if (rst.next()) { try (ObjectInputStream ois = getObjectInputStream(rst.getBinaryStream(2))) { - if (contextLog.isDebugEnabled()) { - contextLog.debug(sm.getString(getStoreName() + ".loading", id, sessionTable)); + if (contextLog.isTraceEnabled()) { + contextLog.trace(sm.getString(getStoreName() + ".loading", id, sessionTable)); } _session = (StandardSession) manager.createEmptySession(); @@ -507,8 +507,8 @@ public class DataSourceStore extends StoreBase { numberOfTries--; } - if (manager.getContext().getLogger().isDebugEnabled()) { - manager.getContext().getLogger().debug(sm.getString(getStoreName() + ".removing", id, sessionTable)); + if (manager.getContext().getLogger().isTraceEnabled()) { + manager.getContext().getLogger().trace(sm.getString(getStoreName() + ".removing", id, sessionTable)); } } @@ -619,9 +619,9 @@ public class DataSourceStore extends StoreBase { } } - if (manager.getContext().getLogger().isDebugEnabled()) { + if (manager.getContext().getLogger().isTraceEnabled()) { manager.getContext().getLogger() - .debug(sm.getString(getStoreName() + ".saving", session.getIdInternal(), sessionTable)); + .trace(sm.getString(getStoreName() + ".saving", session.getIdInternal(), sessionTable)); } } diff --git a/java/org/apache/catalina/session/FileStore.java b/java/org/apache/catalina/session/FileStore.java index 1de64e869f..1fa34b90d6 100644 --- a/java/org/apache/catalina/session/FileStore.java +++ b/java/org/apache/catalina/session/FileStore.java @@ -218,8 +218,8 @@ public final class FileStore extends StoreBase { Context context = getManager().getContext(); Log contextLog = context.getLogger(); - if (contextLog.isDebugEnabled()) { - contextLog.debug(sm.getString(getStoreName() + ".loading", id, file.getAbsolutePath())); + if (contextLog.isTraceEnabled()) { + contextLog.trace(sm.getString(getStoreName() + ".loading", id, file.getAbsolutePath())); } ClassLoader oldThreadContextCL = context.bind(Globals.IS_SECURITY_ENABLED, null); @@ -256,9 +256,9 @@ public final class FileStore extends StoreBase { if (file == null) { return; } - if (manager.getContext().getLogger().isDebugEnabled()) { + if (manager.getContext().getLogger().isTraceEnabled()) { manager.getContext().getLogger() - .debug(sm.getString(getStoreName() + ".removing", id, file.getAbsolutePath())); + .trace(sm.getString(getStoreName() + ".removing", id, file.getAbsolutePath())); } if (file.exists() && !file.delete()) { @@ -282,9 +282,9 @@ public final class FileStore extends StoreBase { if (file == null) { return; } - if (manager.getContext().getLogger().isDebugEnabled()) { + if (manager.getContext().getLogger().isTraceEnabled()) { manager.getContext().getLogger() - .debug(sm.getString(getStoreName() + ".saving", session.getIdInternal(), file.getAbsolutePath())); + .trace(sm.getString(getStoreName() + ".saving", session.getIdInternal(), file.getAbsolutePath())); } try (FileOutputStream fos = new FileOutputStream(file.getAbsolutePath()); diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java index 71d978940f..067b30f4b8 100644 --- a/java/org/apache/catalina/session/ManagerBase.java +++ b/java/org/apache/catalina/session/ManagerBase.java @@ -587,8 +587,8 @@ public abstract class ManagerBase extends LifecycleMBeanBase implements Manager Session sessions[] = findSessions(); int expireHere = 0; - if (log.isDebugEnabled()) { - log.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); + if (log.isTraceEnabled()) { + log.trace("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); } for (Session session : sessions) { if (session != null && !session.isValid()) { @@ -596,8 +596,8 @@ public abstract class ManagerBase extends LifecycleMBeanBase implements Manager } } long timeEnd = System.currentTimeMillis(); - if (log.isDebugEnabled()) { - log.debug("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + + if (log.isTraceEnabled()) { + log.trace("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions: " + expireHere); } processingTime += (timeEnd - timeNow); diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index 2374207105..26af3478a4 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -398,8 +398,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store long timeNow = System.currentTimeMillis(); Session sessions[] = findSessions(); int expireHere = 0; - if (log.isDebugEnabled()) { - log.debug("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); + if (log.isTraceEnabled()) { + log.trace("Start expire sessions " + getName() + " at " + timeNow + " sessioncount " + sessions.length); } for (Session session : sessions) { if (!session.isValid()) { @@ -413,8 +413,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store } long timeEnd = System.currentTimeMillis(); - if (log.isDebugEnabled()) { - log.debug("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + + if (log.isTraceEnabled()) { + log.trace("End expire sessions " + getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions: " + expireHere); } processingTime += (timeEnd - timeNow); @@ -708,8 +708,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store } private void reactivateLoadedSession(String id, Session session) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("persistentManager.swapIn", id)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("persistentManager.swapIn", id)); } session.setManager(this); @@ -845,8 +845,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store @Override protected void stopInternal() throws LifecycleException { - if (log.isDebugEnabled()) { - log.debug("Stopping"); + if (log.isTraceEnabled()) { + log.trace("Stopping"); } setState(LifecycleState.STOPPING); @@ -902,8 +902,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store // Session is currently being accessed - skip it continue; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("persistentManager.swapMaxIdle", session.getIdInternal(), + if (log.isTraceEnabled()) { + log.trace(sm.getString("persistentManager.swapMaxIdle", session.getIdInternal(), Integer.valueOf(timeIdle))); } try { @@ -952,8 +952,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store // Session is currently being accessed - skip it continue; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("persistentManager.swapTooManyActive", session.getIdInternal(), + if (log.isTraceEnabled()) { + log.trace(sm.getString("persistentManager.swapTooManyActive", session.getIdInternal(), Integer.valueOf(timeIdle))); } try { @@ -996,8 +996,8 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store } int timeIdle = (int) (session.getIdleTimeInternal() / 1000L); if (timeIdle >= maxIdleBackup) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("persistentManager.backupMaxIdle", session.getIdInternal(), + if (log.isTraceEnabled()) { + log.trace(sm.getString("persistentManager.backupMaxIdle", session.getIdInternal(), Integer.valueOf(timeIdle))); } diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java index d6c75a540c..4ed5791eca 100644 --- a/java/org/apache/catalina/session/StandardManager.java +++ b/java/org/apache/catalina/session/StandardManager.java @@ -166,8 +166,8 @@ public class StandardManager extends ManagerBase { * @exception IOException if an input/output error occurs */ protected void doLoad() throws ClassNotFoundException, IOException { - if (log.isDebugEnabled()) { - log.debug("Start: Loading persisted sessions"); + if (log.isTraceEnabled()) { + log.trace("Start: Loading persisted sessions"); } // Initialize our internal data structures @@ -178,8 +178,8 @@ public class StandardManager extends ManagerBase { if (file == null) { return; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("standardManager.loading", pathname)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("standardManager.loading", pathname)); } Loader loader = null; ClassLoader classLoader = null; @@ -202,8 +202,8 @@ public class StandardManager extends ManagerBase { getSessionAttributeValueClassNamePattern(), getWarnOnSessionAttributeFilterFailure())) { Integer count = (Integer) ois.readObject(); int n = count.intValue(); - if (log.isDebugEnabled()) { - log.debug("Loading " + n + " persisted sessions"); + if (log.isTraceEnabled()) { + log.trace("Loading " + n + " persisted sessions"); } for (int i = 0; i < n; i++) { StandardSession session = getNewSession(); @@ -235,8 +235,8 @@ public class StandardManager extends ManagerBase { return; } - if (log.isDebugEnabled()) { - log.debug("Finish: Loading persisted sessions"); + if (log.isTraceEnabled()) { + log.trace("Finish: Loading persisted sessions"); } } @@ -269,8 +269,8 @@ public class StandardManager extends ManagerBase { */ protected void doUnload() throws IOException { - if (log.isDebugEnabled()) { - log.debug(sm.getString("standardManager.unloading.debug")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("standardManager.unloading.debug")); } if (sessions.isEmpty()) { @@ -283,8 +283,8 @@ public class StandardManager extends ManagerBase { if (file == null) { return; } - if (log.isDebugEnabled()) { - log.debug(sm.getString("standardManager.unloading", pathname)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("standardManager.unloading", pathname)); } // Keep a note of sessions that are expired @@ -295,8 +295,8 @@ public class StandardManager extends ManagerBase { ObjectOutputStream oos = new ObjectOutputStream(bos)) { synchronized (sessions) { - if (log.isDebugEnabled()) { - log.debug("Unloading " + sessions.size() + " sessions"); + if (log.isTraceEnabled()) { + log.trace("Unloading " + sessions.size() + " sessions"); } // Write the number of active sessions, followed by the details oos.writeObject(Integer.valueOf(sessions.size())); @@ -323,8 +323,8 @@ public class StandardManager extends ManagerBase { } } - if (log.isDebugEnabled()) { - log.debug("Unloading complete"); + if (log.isTraceEnabled()) { + log.trace("Unloading complete"); } } @@ -363,8 +363,8 @@ public class StandardManager extends ManagerBase { @Override protected void stopInternal() throws LifecycleException { - if (log.isDebugEnabled()) { - log.debug("Stopping"); + if (log.isTraceEnabled()) { + log.trace("Stopping"); } setState(LifecycleState.STOPPING); diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 9388881a5d..6caa2acbc6 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -1353,8 +1353,8 @@ public class StandardSession implements HttpSession, Session, Serializable { principal = null; // Transient (may be set later) // setId((String) stream.readObject()); id = (String) stream.readObject(); - if (manager.getContext().getLogger().isDebugEnabled()) { - manager.getContext().getLogger().debug("readObject() loading session " + id); + if (manager.getContext().getLogger().isTraceEnabled()) { + manager.getContext().getLogger().trace("readObject() loading session " + id); } if (notes == null) { @@ -1426,8 +1426,8 @@ public class StandardSession implements HttpSession, Session, Serializable { } throw wae; } - if (manager.getContext().getLogger().isDebugEnabled()) { - manager.getContext().getLogger().debug(" loading attribute '" + name + "' with value '" + value + "'"); + if (manager.getContext().getLogger().isTraceEnabled()) { + manager.getContext().getLogger().trace(" loading attribute '" + name + "' with value '" + value + "'"); } // Handle the case where the filter configuration was changed while // the web application was stopped. @@ -1471,8 +1471,8 @@ public class StandardSession implements HttpSession, Session, Serializable { stream.writeObject(Boolean.valueOf(isValid)); stream.writeObject(Long.valueOf(thisAccessedTime)); stream.writeObject(id); - if (manager.getContext().getLogger().isDebugEnabled()) { - manager.getContext().getLogger().debug("writeObject() storing session " + id); + if (manager.getContext().getLogger().isTraceEnabled()) { + manager.getContext().getLogger().trace("writeObject() storing session " + id); } // Gather authentication information (if configured) @@ -1524,8 +1524,8 @@ public class StandardSession implements HttpSession, Session, Serializable { stream.writeObject(saveNames.get(i)); try { stream.writeObject(saveValues.get(i)); - if (manager.getContext().getLogger().isDebugEnabled()) { - manager.getContext().getLogger().debug( + if (manager.getContext().getLogger().isTraceEnabled()) { + manager.getContext().getLogger().trace( " storing attribute '" + saveNames.get(i) + "' with value '" + saveValues.get(i) + "'"); } } catch (NotSerializableException e) { diff --git a/java/org/apache/catalina/session/StoreBase.java b/java/org/apache/catalina/session/StoreBase.java index 60d717e1ba..4c0bc1422d 100644 --- a/java/org/apache/catalina/session/StoreBase.java +++ b/java/org/apache/catalina/session/StoreBase.java @@ -144,9 +144,9 @@ public abstract class StoreBase extends LifecycleBase implements Store { manager.getContext().getLogger().error("Error getting keys", e); return; } - if (manager.getContext().getLogger().isDebugEnabled()) { + if (manager.getContext().getLogger().isTraceEnabled()) { manager.getContext().getLogger() - .debug(getStoreName() + ": processExpires check number of " + keys.length + " sessions"); + .trace(getStoreName() + ": processExpires check number of " + keys.length + " sessions"); } long timeNow = System.currentTimeMillis(); @@ -161,9 +161,9 @@ public abstract class StoreBase extends LifecycleBase implements Store { if (timeIdle < session.getMaxInactiveInterval()) { continue; } - if (manager.getContext().getLogger().isDebugEnabled()) { + if (manager.getContext().getLogger().isTraceEnabled()) { manager.getContext().getLogger() - .debug(getStoreName() + ": processExpires expire store session " + key); + .trace(getStoreName() + ": processExpires expire store session " + key); } boolean isLoaded = false; if (manager instanceof PersistentManagerBase) { diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java index cbd1424b09..b31bdd1edf 100644 --- a/java/org/apache/catalina/startup/Bootstrap.java +++ b/java/org/apache/catalina/startup/Bootstrap.java @@ -255,15 +255,15 @@ public final class Bootstrap { SecurityClassLoad.securityClassLoad(catalinaLoader); // Load our startup class and call its process() method - if (log.isDebugEnabled()) { - log.debug("Loading startup class"); + if (log.isTraceEnabled()) { + log.trace("Loading startup class"); } Class<?> startupClass = catalinaLoader.loadClass("org.apache.catalina.startup.Catalina"); Object startupInstance = startupClass.getConstructor().newInstance(); // Set the shared extensions class loader - if (log.isDebugEnabled()) { - log.debug("Setting startup class properties"); + if (log.isTraceEnabled()) { + log.trace("Setting startup class properties"); } String methodName = "setParentClassLoader"; Class<?> paramTypes[] = new Class[1]; @@ -296,8 +296,8 @@ public final class Bootstrap { param[0] = arguments; } Method method = catalinaDaemon.getClass().getMethod(methodName, paramTypes); - if (log.isDebugEnabled()) { - log.debug("Calling startup class " + method); + if (log.isTraceEnabled()) { + log.trace("Calling startup class " + method); } method.invoke(catalinaDaemon, param); } diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java index 49b4504d9a..0531de5e4e 100644 --- a/java/org/apache/catalina/startup/Catalina.java +++ b/java/org/apache/catalina/startup/Catalina.java @@ -1003,8 +1003,8 @@ public class Catalina { @Override public void begin(String namespace, String name, Attributes attributes) throws Exception { - if (digester.getLogger().isDebugEnabled()) { - digester.getLogger().debug("Setting parent class loader"); + if (digester.getLogger().isTraceEnabled()) { + digester.getLogger().trace("Setting parent class loader"); } Container top = (Container) digester.peek(); diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java b/java/org/apache/catalina/startup/ClassLoaderFactory.java index 138ca6bc81..5965baaced 100644 --- a/java/org/apache/catalina/startup/ClassLoaderFactory.java +++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java @@ -218,9 +218,9 @@ public final class ClassLoaderFactory { // Construct the class loader itself final URL[] array = set.toArray(new URL[0]); - if (log.isDebugEnabled()) { + if (log.isTraceEnabled()) { for (int i = 0; i < array.length; i++) { - log.debug(" location " + i + " is " + array[i]); + log.trace(" location " + i + " is " + array[i]); } } diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index c7378d9c53..2c1ced2222 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -722,8 +722,8 @@ public class ContextConfig implements LifecycleListener { errorHandler.logFindings(log, contextXml.toString()); ok = false; } - if (log.isDebugEnabled()) { - log.debug("Successfully processed context [" + context.getName() + "] configuration file [" + + if (log.isTraceEnabled()) { + log.trace("Successfully processed context [" + context.getName() + "] configuration file [" + contextXml + "]"); } } catch (SAXParseException e) { @@ -919,8 +919,8 @@ public class ContextConfig implements LifecycleListener { contextDigester.getParser(); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.init")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.init")); } context.setConfigured(false); ok = true; @@ -950,12 +950,12 @@ public class ContextConfig implements LifecycleListener { protected synchronized void configureStart() { // Called from StandardContext.start() - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.start")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.start")); } - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.xmlSettings", context.getName(), + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.xmlSettings", context.getName(), Boolean.valueOf(context.getXmlValidation()), Boolean.valueOf(context.getXmlNamespaceAware()))); } @@ -974,8 +974,8 @@ public class ContextConfig implements LifecycleListener { } // Dump the contents of this pipeline if requested - if (log.isDebugEnabled()) { - log.debug("Pipeline Configuration:"); + if (log.isTraceEnabled()) { + log.trace("Pipeline Configuration:"); Pipeline pipeline = context.getPipeline(); Valve valves[] = null; if (pipeline != null) { @@ -983,10 +983,10 @@ public class ContextConfig implements LifecycleListener { } if (valves != null) { for (Valve valve : valves) { - log.debug(" " + valve.getClass().getName()); + log.trace(" " + valve.getClass().getName()); } } - log.debug("======================"); + log.trace("======================"); } // Make our application available if no problems were encountered @@ -1005,8 +1005,8 @@ public class ContextConfig implements LifecycleListener { */ protected synchronized void configureStop() { - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.stop")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.stop")); } int i; @@ -1103,8 +1103,8 @@ public class ContextConfig implements LifecycleListener { */ protected synchronized void destroy() { // Called from StandardContext.destroy() - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.destroy")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.destroy")); } // Skip clearing the work directory if Tomcat is being shutdown @@ -2132,8 +2132,8 @@ public class ContextConfig implements LifecycleListener { if (webResource.isDirectory()) { WebResource[] webResources = webResource.getWebResourceRoot().listResources(webResource.getWebappPath()); if (webResources.length > 0) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.processAnnotationsWebDir.debug", webResource.getURL())); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.processAnnotationsWebDir.debug", webResource.getURL())); } for (WebResource r : webResources) { processAnnotationsWebResource(r, fragment, handlesTypesOnly, javaClassCache); @@ -2173,8 +2173,8 @@ public class ContextConfig implements LifecycleListener { Map<String,JavaClassCacheEntry> javaClassCache) { try (Jar jar = JarFactory.newInstance(url)) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.processAnnotationsJar.debug", url)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.processAnnotationsJar.debug", url)); } jar.nextEntry(); @@ -2203,8 +2203,8 @@ public class ContextConfig implements LifecycleListener { // Returns null if directory is not readable String[] dirs = file.list(); if (dirs != null) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("contextConfig.processAnnotationsDir.debug", file)); + if (log.isTraceEnabled()) { + log.trace(sm.getString("contextConfig.processAnnotationsDir.debug", file)); } for (String dir : dirs) { processAnnotationsFile(new File(file, dir), fragment, handlesTypesOnly, javaClassCache); diff --git a/java/org/apache/catalina/startup/EngineConfig.java b/java/org/apache/catalina/startup/EngineConfig.java index 2b8b920a3e..941c1cebb7 100644 --- a/java/org/apache/catalina/startup/EngineConfig.java +++ b/java/org/apache/catalina/startup/EngineConfig.java @@ -89,8 +89,8 @@ public class EngineConfig implements LifecycleListener { */ protected void start() { - if (engine.getLogger().isDebugEnabled()) { - engine.getLogger().debug(sm.getString("engineConfig.start")); + if (engine.getLogger().isTraceEnabled()) { + engine.getLogger().trace(sm.getString("engineConfig.start")); } } @@ -101,8 +101,8 @@ public class EngineConfig implements LifecycleListener { */ protected void stop() { - if (engine.getLogger().isDebugEnabled()) { - engine.getLogger().debug(sm.getString("engineConfig.stop")); + if (engine.getLogger().isTraceEnabled()) { + engine.getLogger().trace(sm.getString("engineConfig.stop")); } } diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index c543abb445..748594b942 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -1297,14 +1297,14 @@ public class HostConfig implements LifecycleListener { if (docBase != null) { resource = new File(docBaseFile, watchedResource); } else { - if (log.isDebugEnabled()) { - log.debug("Ignoring non-existent WatchedResource '" + resource.getAbsolutePath() + "'"); + if (log.isTraceEnabled()) { + log.trace("Ignoring non-existent WatchedResource '" + resource.getAbsolutePath() + "'"); } continue; } } - if (log.isDebugEnabled()) { - log.debug("Watching WatchedResource '" + resource.getAbsolutePath() + "'"); + if (log.isTraceEnabled()) { + log.trace("Watching WatchedResource '" + resource.getAbsolutePath() + "'"); } app.reloadResources.put(resource.getAbsolutePath(), Long.valueOf(resource.lastModified())); } @@ -1341,8 +1341,8 @@ public class HostConfig implements LifecycleListener { long currentTimeWithResolutionOffset = System.currentTimeMillis() - FILE_MODIFICATION_RESOLUTION_MS; for (int i = 0; i < resources.length; i++) { File resource = new File(resources[i]); - if (log.isDebugEnabled()) { - log.debug("Checking context[" + app.name + "] redeploy resource " + resource); + if (log.isTraceEnabled()) { + log.trace("Checking context[" + app.name + "] redeploy resource " + resource); } long lastModified = app.redeployResources.get(resources[i]).longValue(); if (resource.exists() || lastModified == 0) { @@ -1418,8 +1418,8 @@ public class HostConfig implements LifecycleListener { boolean update = false; for (String s : resources) { File resource = new File(s); - if (log.isDebugEnabled()) { - log.debug("Checking context[" + app.name + "] reload resource " + resource); + if (log.isTraceEnabled()) { + log.trace("Checking context[" + app.name + "] reload resource " + resource); } long lastModified = app.reloadResources.get(s).longValue(); // File.lastModified() has a resolution of 1s (1000ms). The last @@ -1607,8 +1607,8 @@ public class HostConfig implements LifecycleListener { */ public void start() { - if (log.isDebugEnabled()) { - log.debug(sm.getString("hostConfig.start")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("hostConfig.start")); } try { @@ -1636,8 +1636,8 @@ public class HostConfig implements LifecycleListener { */ public void stop() { - if (log.isDebugEnabled()) { - log.debug(sm.getString("hostConfig.stop")); + if (log.isTraceEnabled()) { + log.trace(sm.getString("hostConfig.stop")); } if (oname != null) { diff --git a/java/org/apache/catalina/startup/Tool.java b/java/org/apache/catalina/startup/Tool.java index 68499c33c8..9593a937d4 100644 --- a/java/org/apache/catalina/startup/Tool.java +++ b/java/org/apache/catalina/startup/Tool.java @@ -194,8 +194,8 @@ public final class Tool { String params[] = new String[args.length - index]; System.arraycopy(args, index, params, 0, params.length); try { - if (log.isDebugEnabled()) { - log.debug("Identifying main() method"); + if (log.isTraceEnabled()) { + log.trace("Identifying main() method"); } String methodName = "main"; Class<?> paramTypes[] = new Class[1]; @@ -209,8 +209,8 @@ public final class Tool { // Invoke the main method of the application class try { - if (log.isDebugEnabled()) { - log.debug("Calling main() method"); + if (log.isTraceEnabled()) { + log.trace("Calling main() method"); } Object paramValues[] = new Object[1]; paramValues[0] = params; diff --git a/java/org/apache/catalina/startup/UserConfig.java b/java/org/apache/catalina/startup/UserConfig.java index c8e5648c8d..1fd963b153 100644 --- a/java/org/apache/catalina/startup/UserConfig.java +++ b/java/org/apache/catalina/startup/UserConfig.java @@ -282,8 +282,8 @@ public final class UserConfig implements LifecycleListener { */ private void deploy() { - if (host.getLogger().isDebugEnabled()) { - host.getLogger().debug(sm.getString("userConfig.deploying")); + if (host.getLogger().isTraceEnabled()) { + host.getLogger().trace(sm.getString("userConfig.deploying")); } // Load the user database object for this host diff --git a/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java b/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java index f5085cb6af..57418ad07c 100644 --- a/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java +++ b/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java @@ -38,8 +38,8 @@ public class CredentialHandlerSF extends StoreFactoryBase { aElement.getClass()); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("factory.storeTag", + if (log.isTraceEnabled()) { + log.trace(sm.getString("factory.storeTag", elementDesc.getTag(), aElement)); } getStoreAppender().printIndent(aWriter, indent + 2); diff --git a/java/org/apache/catalina/storeconfig/InterceptorSF.java b/java/org/apache/catalina/storeconfig/InterceptorSF.java index a8fe289446..16d86e99c4 100644 --- a/java/org/apache/catalina/storeconfig/InterceptorSF.java +++ b/java/org/apache/catalina/storeconfig/InterceptorSF.java @@ -38,8 +38,8 @@ public class InterceptorSF extends StoreFactoryBase { aElement.getClass()); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("factory.storeTag", + if (log.isTraceEnabled()) { + log.trace(sm.getString("factory.storeTag", elementDesc.getTag(), aElement)); } getStoreAppender().printIndent(aWriter, indent + 2); diff --git a/java/org/apache/catalina/storeconfig/LoaderSF.java b/java/org/apache/catalina/storeconfig/LoaderSF.java index f4c354b8b7..6f3a4a2c0c 100644 --- a/java/org/apache/catalina/storeconfig/LoaderSF.java +++ b/java/org/apache/catalina/storeconfig/LoaderSF.java @@ -43,9 +43,8 @@ public class LoaderSF extends StoreFactoryBase { if (elementDesc != null) { Loader loader = (Loader) aElement; if (!isDefaultLoader(loader)) { - if (log.isDebugEnabled()) { - log.debug("store " + elementDesc.getTag() + "( " + aElement - + " )"); + if (log.isTraceEnabled()) { + log.trace("store " + elementDesc.getTag() + "( " + aElement + " )"); } getStoreAppender().printIndent(aWriter, indent + 2); getStoreAppender().printTag(aWriter, indent + 2, loader, @@ -53,10 +52,10 @@ public class LoaderSF extends StoreFactoryBase { } } else { if (log.isWarnEnabled()) { - log - .warn("Descriptor for element" - + aElement.getClass() - + " not configured or element class not StandardManager!"); + if (log.isWarnEnabled()) { + log.warn(sm.getString("factory.storeNoDescriptor", aElement + .getClass())); + } } } } diff --git a/java/org/apache/catalina/storeconfig/ManagerSF.java b/java/org/apache/catalina/storeconfig/ManagerSF.java index 775da900d4..85f7fda05f 100644 --- a/java/org/apache/catalina/storeconfig/ManagerSF.java +++ b/java/org/apache/catalina/storeconfig/ManagerSF.java @@ -45,8 +45,8 @@ public class ManagerSF extends StoreFactoryBase { if (aElement instanceof StandardManager) { StandardManager manager = (StandardManager) aElement; if (!isDefaultManager(manager)) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("factory.storeTag", elementDesc + if (log.isTraceEnabled()) { + log.trace(sm.getString("factory.storeTag", elementDesc .getTag(), aElement)); } super.store(aWriter, indent, aElement); diff --git a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java index 46dba5c3df..db49f81157 100644 --- a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java +++ b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java @@ -45,9 +45,8 @@ public class NamingResourcesSF extends StoreFactoryBase { StoreDescription elementDesc = getRegistry().findDescription( aElement.getClass()); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug("store " + elementDesc.getTag() + "( " + aElement - + " )"); + if (log.isTraceEnabled()) { + log.trace("store " + elementDesc.getTag() + "( " + aElement + " )"); } storeChildren(aWriter, indent, aElement, elementDesc); } else { diff --git a/java/org/apache/catalina/storeconfig/RealmSF.java b/java/org/apache/catalina/storeconfig/RealmSF.java index 1463ba3a63..5da13387cf 100644 --- a/java/org/apache/catalina/storeconfig/RealmSF.java +++ b/java/org/apache/catalina/storeconfig/RealmSF.java @@ -39,8 +39,8 @@ public class RealmSF extends StoreFactoryBase { aElement.getClass()); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("factory.storeTag", + if (log.isTraceEnabled()) { + log.trace(sm.getString("factory.storeTag", elementDesc.getTag(), aElement)); } getStoreAppender().printIndent(aWriter, indent + 2); diff --git a/java/org/apache/catalina/storeconfig/StandardServerSF.java b/java/org/apache/catalina/storeconfig/StandardServerSF.java index f654b6d780..6db94f4f13 100644 --- a/java/org/apache/catalina/storeconfig/StandardServerSF.java +++ b/java/org/apache/catalina/storeconfig/StandardServerSF.java @@ -68,20 +68,6 @@ public class StandardServerSF extends StoreFactoryBase { // Store nested <Listener> elements LifecycleListener listeners[] = server.findLifecycleListeners(); storeElementArray(aWriter, indent, listeners); - /*LifecycleListener listener = null; - for (int i = 0; listener == null && i < listeners.length; i++) - if (listeners[i] instanceof ServerLifecycleListener) - listener = listeners[i]; - if (listener != null) { - StoreDescription elementDesc = getRegistry() - .findDescription( - StandardServer.class.getName() - + ".[ServerLifecycleListener]"); - if (elementDesc != null) { - elementDesc.getStoreFactory().store(aWriter, indent, - listener); - } - }*/ // Store nested <GlobalNamingResources> element NamingResourcesImpl globalNamingResources = server .getGlobalNamingResources(); diff --git a/java/org/apache/catalina/storeconfig/StoreFactoryBase.java b/java/org/apache/catalina/storeconfig/StoreFactoryBase.java index afd872a47e..1809117e15 100644 --- a/java/org/apache/catalina/storeconfig/StoreFactoryBase.java +++ b/java/org/apache/catalina/storeconfig/StoreFactoryBase.java @@ -115,8 +115,8 @@ public class StoreFactoryBase implements IStoreFactory { aElement.getClass()); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("factory.storeTag", + if (log.isTraceEnabled()) { + log.trace(sm.getString("factory.storeTag", elementDesc.getTag(), aElement)); } getStoreAppender().printIndent(aWriter, indent + 2); diff --git a/java/org/apache/catalina/storeconfig/StoreRegistry.java b/java/org/apache/catalina/storeconfig/StoreRegistry.java index 2b77b3fc49..a4dea64261 100644 --- a/java/org/apache/catalina/storeconfig/StoreRegistry.java +++ b/java/org/apache/catalina/storeconfig/StoreRegistry.java @@ -107,8 +107,8 @@ public class StoreRegistry { * @return the description */ public StoreDescription findDescription(String id) { - if (log.isDebugEnabled()) { - log.debug("search descriptor " + id); + if (log.isTraceEnabled()) { + log.trace("search descriptor " + id); } StoreDescription desc = descriptors.get(id); if (desc == null) { @@ -129,7 +129,7 @@ public class StoreRegistry { } if (log.isDebugEnabled()) { if (desc != null) { - log.debug("find descriptor " + id + "#" + desc.getTag() + "#" + log.trace("find descriptor " + id + "#" + desc.getTag() + "#" + desc.getStoreFactoryClass()); } else { log.debug(("Can't find descriptor for key " + id)); @@ -185,8 +185,8 @@ public class StoreRegistry { key = desc.getTagClass(); } descriptors.put(key, desc); - if (log.isDebugEnabled()) { - log.debug("register store descriptor " + key + "#" + desc.getTag() + if (log.isTraceEnabled()) { + log.trace("register store descriptor " + key + "#" + desc.getTag() + "#" + desc.getTagClass()); } } diff --git a/java/org/apache/catalina/storeconfig/WatchedResourceSF.java b/java/org/apache/catalina/storeconfig/WatchedResourceSF.java index f9295e63ae..cc7b692b62 100644 --- a/java/org/apache/catalina/storeconfig/WatchedResourceSF.java +++ b/java/org/apache/catalina/storeconfig/WatchedResourceSF.java @@ -40,9 +40,8 @@ public class WatchedResourceSF extends StoreFactoryBase { String[] resources = ((StandardContext) aElement) .findWatchedResources(); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug("store " + elementDesc.getTag() + "( " + aElement - + " )"); + if (log.isTraceEnabled()) { + log.trace("store " + elementDesc.getTag() + "( " + aElement + " )"); } getStoreAppender().printTagArray(aWriter, "WatchedResource", indent, resources); diff --git a/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java b/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java index 889ec80c4a..d06d3ba175 100644 --- a/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java +++ b/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java @@ -40,9 +40,8 @@ public class WrapperLifecycleSF extends StoreFactoryBase { String[] listeners = ((StandardContext) aElement) .findWrapperLifecycles(); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug("store " + elementDesc.getTag() + "( " + aElement - + " )"); + if (log.isTraceEnabled()) { + log.trace("store " + elementDesc.getTag() + "( " + aElement + " )"); } getStoreAppender().printTagArray(aWriter, "WrapperLifecycle", indent, listeners); diff --git a/java/org/apache/catalina/storeconfig/WrapperListenerSF.java b/java/org/apache/catalina/storeconfig/WrapperListenerSF.java index edca75dfe9..2827554502 100644 --- a/java/org/apache/catalina/storeconfig/WrapperListenerSF.java +++ b/java/org/apache/catalina/storeconfig/WrapperListenerSF.java @@ -40,8 +40,8 @@ public class WrapperListenerSF extends StoreFactoryBase { String[] listeners = ((StandardContext) aElement) .findWrapperListeners(); if (elementDesc != null) { - if (log.isDebugEnabled()) { - log.debug("store " + elementDesc.getTag() + "( " + aElement + if (log.isTraceEnabled()) { + log.trace("store " + elementDesc.getTag() + "( " + aElement + " )"); } getStoreAppender().printTagArray(aWriter, "WrapperListener", --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org