Author: markt
Date: Mon Mar 8 12:45:56 2010
New Revision: 920298
URL: http://svn.apache.org/viewvc?rev=920298&view=rev
Log:
Add context name to leak detection log messages
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=920298&r1=920297&r2=920298&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Mon
Mar 8 12:45:56 2010
@@ -17,7 +17,6 @@
fileClassLoader.exists=Repository {0} does not exist
fileClassLoader.jarFile=Cannot read JAR file {0}
fileClassLoader.restricted=Cannot load restricted class {0}
-jdbcLeakPrevention.jdbcRemoveFailed=Unable to de-register driver {0}
standardLoader.addRepository=Adding repository {0}
standardLoader.alreadyStarted=Loader has already been started
standardLoader.checkInterval=Cannot set reload check interval to {0} seconds
@@ -30,23 +29,23 @@
standardLoader.starting=Starting this Loader
standardLoader.stopping=Stopping this Loader
webappClassLoader.illegalJarPath=Illegal JAR entry detected with name {0}
-webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed
-webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during
JDBC driver de-registration
+webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed for web
application [{0}]
+webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during
JDBC driver de-registration for web application [{0}]
webappClassLoader.stopped=Illegal access: this web application instance has
been stopped already. Could not load {0}. The eventual following stack trace
is caused by an error thrown for debugging purposes as well as to attempt to
terminate the thread which caused the illegal access, and has no functional
impact.
webappClassLoader.readError=Resource read error: Could not load {0}.
-webappClassLoader.clearJbdc=A web application registered the JBDC driver [{0}]
but failed to unregister it when the web application was stopped. To prevent a
memory leak, the JDBC Driver has been forcibly unregistered.
-webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}]
ResourceBundle references from the cache
-webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear
ResourceBundle references
-webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target
to clear context class loader. This is expected on non-Sun JVMs.
-webappClassLoader.clearRmiFail=Failed to clear context class loader referenced
from sun.rmi.transport.Target
-webappClassLoader.clearThreadLocalDebug=A web application created a
ThreadLocal with key of type [{0}] (value [{1}]). The ThreadLocal has been
correctly set to null and the key will be removed by GC. However, to simplify
the process of tracing memory leaks, the key has been forcibly removed.
-webappClassLoader.clearThreadLocal=A web application created a ThreadLocal
with key of type [{0}] (value [{1}]) and a value of type [{2}] (value [{3}])
but failed to remove it when the web application was stopped. To prevent a
memory leak, the ThreadLocal has been forcibly removed.
-webappClassLoader.clearThreadLocalFail=Failed to clear ThreadLocal references
-webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}]
-webappClassLoader.stopTimerThreadFail=Failed to terminate TimerThread named
[{0}]
+webappClassLoader.clearJbdc=The web application [{0}] registered the JBDC
driver [{1}] but failed to unregister it when the web application was stopped.
To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
+webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}]
ResourceBundle references from the cache for web application [{1}]
+webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear
ResourceBundle references for web application [{0}]
+webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target
to clear context class loader for web application [{0}]. This is expected on
non-Sun JVMs.
+webappClassLoader.clearRmiFail=Failed to clear context class loader referenced
from sun.rmi.transport.Target for web application [{0}]
+webappClassLoader.clearThreadLocalDebug=The web application [{0}] created a
ThreadLocal with key of type [{1}] (value [{2}]). The ThreadLocal has been
correctly set to null and the key will be removed by GC. However, to simplify
the process of tracing memory leaks, the key has been forcibly removed.
+webappClassLoader.clearThreadLocal=The web application [{0}] created a
ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}]
(value [{4}]) but failed to remove it when the web application was stopped. To
prevent a memory leak, the ThreadLocal has been forcibly removed.
+webappClassLoader.clearThreadLocalFail=Failed to clear ThreadLocal references
for web application [{0}]
+webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}] for
web application [{1}]
+webappClassLoader.stopTimerThreadFail=Failed to terminate TimerThread named
[{0}] for web application [{1}]
webappClassLoader.validationErrorJarPath=Unable to validate JAR entry with
name {0}
-webappClassLoader.warnThread=A web application appears to have started a
thread named [{0}] but has failed to stop it. This is very likely to create a
memory leak.
-webappClassLoader.warnTimerThread=A web application appears to have started a
TimerThread named [{0}] via the java.util.Timer API but has failed to stop it.
To prevent a memory leak, the timer (and hence the associated thread) has been
forcibly cancelled.
+webappClassLoader.warnThread=The web application [{0}] appears to have started
a thread named [{1}] but has failed to stop it. This is very likely to create a
memory leak.
+webappClassLoader.warnTimerThread=The web application [{0}] appears to have
started a TimerThread named [{1}] via the java.util.Timer API but has failed to
stop it. To prevent a memory leak, the timer (and hence the associated thread)
has been forcibly cancelled.
webappClassLoader.wrongVersion=(unable to load class {0})
webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=920298&r1=920297&r2=920298&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Mar
8 12:45:56 2010
@@ -72,6 +72,7 @@
import org.apache.tomcat.util.res.StringManager;
import org.apache.jasper.servlet.JasperLoader;
import org.apache.naming.JndiPermission;
+import org.apache.naming.resources.ProxyDirContext;
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.ResourceAttributes;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -452,6 +453,16 @@
*/
private boolean clearReferencesLogFactoryRelease = true;
+
+ /**
+ * Name of associated context used with logging to associate messages with
+ * the right web application. Particularly useful for the clear references
+ * messages. Defaults to unknown but if standard Tomcat components are used
+ * it will be updated during initialisation from the resources.
+ */
+ private String contextName = "unknown";
+
+
// ------------------------------------------------------------- Properties
@@ -472,6 +483,9 @@
this.resources = resources;
+ if (resources instanceof ProxyDirContext) {
+ contextName = ((ProxyDirContext) resources).getContextName();
+ }
}
@@ -1689,7 +1703,7 @@
// Clearing references should be done before setting started to
// false, due to possible side effects
clearReferences();
-
+
started = false;
int length = files.length;
@@ -1853,18 +1867,21 @@
List<String> driverNames = (List<String>) obj.getClass().getMethod(
"clearJdbcDriverRegistrations").invoke(obj);
for (String name : driverNames) {
- log.error(sm.getString("webappClassLoader.clearJbdc", name));
+ log.error(sm.getString("webappClassLoader.clearJbdc",
+ contextName, name));
}
} catch (Exception e) {
// So many things to go wrong above...
- log.warn(sm.getString("webappClassLoader.jdbcRemoveFailed"), e);
+ log.warn(sm.getString(
+ "webappClassLoader.jdbcRemoveFailed", contextName), e);
} finally {
if (is != null) {
try {
is.close();
} catch (IOException ioe) {
log.warn(sm.getString(
- "webappClassLoader.jdbcRemoveStreamError"), ioe);
+ "webappClassLoader.jdbcRemoveStreamError",
+ contextName), ioe);
}
}
}
@@ -2029,7 +2046,7 @@
}
log.error(sm.getString("webappClassLoader.warnThread",
- thread.getName()));
+ contextName, thread.getName()));
// Don't try an stop the threads unless explicitly
// configured to do so
@@ -2059,19 +2076,19 @@
} catch (SecurityException e) {
log.warn(sm.getString(
"webappClassLoader.stopThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
} catch (NoSuchFieldException e) {
log.warn(sm.getString(
"webappClassLoader.stopThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
} catch (IllegalArgumentException e) {
log.warn(sm.getString(
"webappClassLoader.stopThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
} catch (IllegalAccessException e) {
log.warn(sm.getString(
"webappClassLoader.stopThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
}
// This method is deprecated and for good reason. This is
@@ -2111,24 +2128,24 @@
}
log.error(sm.getString("webappClassLoader.warnTimerThread",
- thread.getName()));
+ contextName, thread.getName()));
} catch (NoSuchFieldException e) {
log.warn(sm.getString(
"webappClassLoader.stopTimerThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
} catch (IllegalAccessException e) {
log.warn(sm.getString(
"webappClassLoader.stopTimerThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
} catch (NoSuchMethodException e) {
log.warn(sm.getString(
"webappClassLoader.stopTimerThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
} catch (InvocationTargetException e) {
log.warn(sm.getString(
"webappClassLoader.stopTimerThreadFail",
- thread.getName()), e);
+ thread.getName(), contextName), e);
}
}
@@ -2164,19 +2181,26 @@
}
}
} catch (SecurityException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
} catch (NoSuchFieldException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
} catch (ClassNotFoundException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
} catch (IllegalArgumentException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
} catch (IllegalAccessException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
} catch (NoSuchMethodException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
} catch (InvocationTargetException e) {
- log.warn(sm.getString("webappClassLoader.clearThreadLocalFail"),
e);
+ log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
+ contextName), e);
}
}
@@ -2216,14 +2240,15 @@
remove = true;
}
if (remove) {
- Object[] args = new Object[4];
+ Object[] args = new Object[5];
+ args[0] = contextName;
if (key != null) {
- args[0] = key.getClass().getCanonicalName();
- args[1] = key.toString();
+ args[1] = key.getClass().getCanonicalName();
+ args[2] = key.toString();
}
if (value != null) {
- args[2] = value.getClass().getCanonicalName();
- args[3] = value.toString();
+ args[3] = value.getClass().getCanonicalName();
+ args[4] = value.toString();
}
if (value == null) {
if (log.isDebugEnabled()) {
@@ -2335,15 +2360,20 @@
}
}
} catch (ClassNotFoundException e) {
- log.info(sm.getString("webappClassLoader.clearRmiInfo"), e);
+ log.info(sm.getString("webappClassLoader.clearRmiInfo",
+ contextName), e);
} catch (SecurityException e) {
- log.warn(sm.getString("webappClassLoader.clearRmiFail"), e);
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
+ contextName), e);
} catch (NoSuchFieldException e) {
- log.warn(sm.getString("webappClassLoader.clearRmiFail"), e);
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
+ contextName), e);
} catch (IllegalArgumentException e) {
- log.warn(sm.getString("webappClassLoader.clearRmiFail"), e);
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
+ contextName), e);
} catch (IllegalAccessException e) {
- log.warn(sm.getString("webappClassLoader.clearRmiFail"), e);
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
+ contextName), e);
}
}
@@ -2407,25 +2437,30 @@
if (countRemoved > 0 && log.isDebugEnabled()) {
log.debug(sm.getString(
"webappClassLoader.clearReferencesResourceBundlesCount",
- Integer.valueOf(countRemoved)));
+ Integer.valueOf(countRemoved), contextName));
}
} catch (SecurityException e) {
log.error(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail"),
e);
+ "webappClassLoader.clearReferencesResourceBundlesFail",
+ contextName), e);
} catch (NoSuchFieldException e) {
if (System.getProperty("java.vendor").startsWith("Sun")) {
log.error(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail"), e);
+ "webappClassLoader.clearReferencesResourceBundlesFail",
+ contextName), e);
} else {
log.debug(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail"), e);
+ "webappClassLoader.clearReferencesResourceBundlesFail",
+ contextName), e);
}
} catch (IllegalArgumentException e) {
log.error(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail"),
e);
+ "webappClassLoader.clearReferencesResourceBundlesFail",
+ contextName), e);
} catch (IllegalAccessException e) {
log.error(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail"),
e);
+ "webappClassLoader.clearReferencesResourceBundlesFail",
+ contextName), e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
