svn commit: r885233 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties StandardContext.java

[markt]

Author: markt
Date: Sun Nov 29 14:32:41 2009
New Revision: 885233

URL: http://svn.apache.org/viewvc?rev=885233&view=rev
Log:
Better logging of what is going on on Context reload

Modified:
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

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=885233&r1=885232&r2=885233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Sun Nov 
29 14:32:41 2009
@@ -110,9 +110,9 @@
 standardContext.notWrapper=Child of a Context must be a Wrapper
 standardContext.parameter.duplicate=Duplicate context initialization parameter 
{0}
 standardContext.parameter.required=Both parameter name and parameter value are 
required
-standardContext.reloadingCompleted=Reloading this Context is completed
+standardContext.reloadingCompleted=Reloading Context with path [{0}] is 
completed
 standardContext.reloadingFailed=Reloading this Context failed due to previous 
errors
-standardContext.reloadingStarted=Reloading this Context has started
+standardContext.reloadingStarted=Reloading Context with path [{0}] has started
 standardContext.resourcesStart=Error starting static Resources
 standardContext.securityConstraint.pattern=Invalid <url-pattern> {0} in 
security constraint
 standardContext.servletMap.name=Servlet mapping specifies an unknown servlet 
name {0}

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=885233&r1=885232&r2=885233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sun Nov 29 
14:32:41 2009
@@ -3259,12 +3259,17 @@
             throw new IllegalStateException
                 (sm.getString("containerBase.notStarted", logName()));
 
+        String path = getPath();
+        if (path.length() == 0) {
+            path = "/";
+        }
+
         // Make sure reloading is enabled
         //      if (!reloadable)
         //          throw new IllegalStateException
         //              (sm.getString("standardContext.notReloadable"));
         if(log.isInfoEnabled())
-            log.info(sm.getString("standardContext.reloadingStarted"));
+            log.info(sm.getString("standardContext.reloadingStarted", path));
 
         // Stop accepting requests temporarily
         setPaused(true);
@@ -3283,6 +3288,9 @@
 
         setPaused(false);
 
+        if(log.isInfoEnabled())
+            log.info(sm.getString("standardContext.reloadingCompleted", path));
+
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org