Author: markt
Date: Fri Jul 2 10:01:32 2010
New Revision: 959931
URL: http://svn.apache.org/viewvc?rev=959931&view=rev
Log:
Additional debug logging for manager selection
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=959931&r1=959930&r2=959931&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Jul
2 10:01:32 2010
@@ -92,6 +92,7 @@ standardContext.alreadyStarted=Context h
standardContext.applicationListener=Error configuring application listener of
class {0}
standardContext.applicationSkipped=Skipped installing application listeners
due to previous error(s)
standardContext.badRequest=Invalid request path ({0}).
+standardContext.cluster.noManager=No manager found. Checking if cluster
manager should be used. Cluster configured: [{0}], Application distributable:
[{1}]
standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can
never be matched.
standardContext.duplicateListener=The listener "{0}" is already configured for
this context. The duplicate definition has been ignored.
standardContext.errorPage.error=Error page location {0} must start with a ''/''
@@ -116,6 +117,7 @@ standardContext.loginConfig.errorWarning
standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/'
standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must
start with a ''/'' in Servlet 2.4
standardContext.loginConfig.required=LoginConfig cannot be null
+standardContext.manager=Configured a manager of class [{0}]
standardContext.mappingError=MAPPING configuration error for relative URI {0}
standardContext.noResourceJar=Resource JARs are not supported. The JAR found
at [{0}] will no be used to provide static content for context with path [{1}]
standardContext.notFound=The requested resource ({0}) is not available.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=959931&r1=959930&r2=959931&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Jul 2
10:01:32 2010
@@ -4682,6 +4682,11 @@ public class StandardContext extends Con
// Acquire clustered manager
Manager contextManager = null;
if (manager == null) {
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("standardContext.cluster.noManager",
+ Boolean.valueOf((getCluster() != null)),
+ Boolean.valueOf(distributable)));
+ }
if ( (getCluster() != null) && distributable) {
try {
contextManager =
getCluster().createManager(getName());
@@ -4696,6 +4701,10 @@ public class StandardContext extends Con
// Configure default manager if none was specified
if (contextManager != null) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("standardContext.manager",
+ contextManager.getClass().getName()));
+ }
setManager(contextManager);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=959931&r1=959930&r2=959931&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 2 10:01:32 2010
@@ -88,6 +88,10 @@
than a 200 is returned for requests that don't map to any other
context.
(markt)
</fix>
+ <add>
+ Additional debug logging in StandardContext to provide information on
+ Manager selection. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
