Author: schultz
Date: Tue Jun 18 14:20:28 2013
New Revision: 1494150
URL: http://svn.apache.org/r1494150
Log:
Back-port of r1494143:
Display hostname and port when failing to stop Tomcat via socket connection.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1494150&r1=1494149&r2=1494150&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Tue Jun
18 14:20:28 2013
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
+import java.net.ConnectException;
import java.net.Socket;
import java.util.ArrayList;
import java.util.HashMap;
@@ -503,6 +504,12 @@ public class Catalina {
stream.write(shutdown.charAt(i));
}
stream.flush();
+ } catch (ConnectException ce) {
+ log.error(sm.getString("catalina.stopServer.connectException",
+ s.getAddress(),
+ String.valueOf(s.getPort())));
+ log.error("Catalina.stop: ", ce);
+ System.exit(1);
} catch (IOException e) {
log.error("Catalina.stop: ", e);
System.exit(1);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1494150&r1=1494149&r2=1494150&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Tue Jun 18 14:20:28 2013
@@ -17,6 +17,7 @@ catalina.configFail=Unable to load serve
catalina.noCluster=Cluster RuleSet not found due to [{0}]. Cluster
configuration disabled.
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
+catalina.stopServer.connectException=Could not contact {0}:{1}. Tomcat may not
be running.
contextConfig.altDDNotFound=alt-dd file {0} not found
contextConfig.annotationsStackOverflow=Unable to complete the scan for
annotations for web application [{0}] due to a StackOverflowError. Possible
root causes include a too low setting for -Xss and illegal cyclic inheritance
dependencies. The class hierarchy being processed was [{1}]
contextConfig.applicationUrl=Unable to determine URL for application web.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
