Better logging of what is going on on Context reload

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@885233 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index f673603..993babd 100644 (file)
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -110,9 +110,9 @@ standardContext.notStarted=Context has not yet been started
 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}

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index e6b7665..ef6d31e 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3259,12 +3259,17 @@ public class StandardContext
             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 @@ public class StandardContext
 
         setPaused(false);
 
+        if(log.isInfoEnabled())
+            log.info(sm.getString("standardContext.reloadingCompleted", path));
+
     }