Log when a valid shutdown command is received. This may help in tracking down "Tomcat...

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

diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 7f094bf..3b6c576 100644 (file)
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -191,6 +191,7 @@ standardPipeline.notStarted=Pipeline has not been started
 standardPipeline.noValve=No more Valves in the Pipeline processing this request
 standardServer.addContainer.ise=No connectors available to associate this container with
 standardServer.initialize.initialized=This server has already been initialized
+standardServer.shutdownViaPort=A valid shutdown command was received via the shutdown port. Stopping the Server instance.
 standardServer.start.connectors=At least one connector is not associated with any container
 standardServer.start.started=This server has already been started
 standardServer.stop.notStarted=This server has not yet been started

diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index d4ef06b..85bb84b 100644 (file)
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -445,6 +445,7 @@ public final class StandardServer
             // Match against our command string
             boolean match = command.toString().equals(shutdown);
             if (match) {
+                log.info(sm.getString("standardServer.shutdownViaPort"));
                 break;
             } else
                 log.warn("StandardServer.await: Invalid command '" +