You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by al...@locus.apache.org on 2000/07/11 09:29:26 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/task StopTomcat.java
alex 00/07/11 00:29:22
Modified: src/share/org/apache/tomcat/resources
LocalStrings.properties LocalStrings_en.properties
src/share/org/apache/tomcat/service PoolTcpEndpoint.java
src/share/org/apache/tomcat/startup Tomcat.java
src/share/org/apache/tomcat/task StopTomcat.java
Log:
More nice error messages:
Could not connect to Tomcat. It's probably already stopped.
Another service is using the requested port (possibly another instance of Tomcat). Please stop the other service and try again.
Tomcat started. Check {0} for error and log messages.
...and a little better exception handling to ice the cake.
Revision Changes Path
1.6 +2 -1 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalStrings.properties 2000/07/11 03:07:44 1.5
+++ LocalStrings.properties 2000/07/11 07:29:18 1.6
@@ -1,4 +1,4 @@
-# $Id: LocalStrings.properties,v 1.5 2000/07/11 03:07:44 alex Exp $
+# $Id: LocalStrings.properties,v 1.6 2000/07/11 07:29:18 alex Exp $
#
# Localized strings for package org.apache.tomcat.core
@@ -31,6 +31,7 @@
tomcat.wrongargs=Wrong arguments
tomcat.stop=Stopping Tomcat.
tomcat.fatal=FATAL:
+tomcat.connectexception=Could not connect to Tomcat. It's probably already stopped.
# LoadOnStartupInterceptor
context.loadServlet.e=cannot load servlet name: {0}
1.3 +1 -0 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_en.properties
Index: LocalStrings_en.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_en.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_en.properties 2000/07/11 03:09:04 1.2
+++ LocalStrings_en.properties 2000/07/11 07:29:18 1.3
@@ -31,6 +31,7 @@
tomcat.wrongargs=Wrong arguments
tomcat.stop=Stopping Tomcat.
tomcat.fatal=FATAL:
+tomcat.connectexception=Could not connect to Tomcat. It's probably already stopped.
# LoadOnStartupInterceptor
context.loadServlet.e=cannot load servlet name: {0}
1.10 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PoolTcpEndpoint.java 2000/07/11 03:13:35 1.9
+++ PoolTcpEndpoint.java 2000/07/11 07:29:19 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v 1.9 2000/07/11 03:13:35 alex Exp $
- * $Revision: 1.9 $
- * $Date: 2000/07/11 03:13:35 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v 1.10 2000/07/11 07:29:19 alex Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/07/11 07:29:19 $
*
* ====================================================================
*
@@ -233,10 +233,10 @@
}
}
} catch( IOException ex ) {
- log("couldn't start endpoint", ex);
+ log("couldn't start endpoint", ex, Logger.DEBUG);
throw ex;
} catch( InstantiationException ex1 ) {
- log("couldn't start endpoint", ex1);
+ log("couldn't start endpoint", ex1, Logger.DEBUG);
throw ex1;
}
if(isPool) {
1.33 +12 -2 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Tomcat.java 2000/07/11 03:26:19 1.32
+++ Tomcat.java 2000/07/11 07:29:20 1.33
@@ -177,7 +177,15 @@
if( doStop ) {
System.out.println(sm.getString("tomcat.stop"));
- stopTomcat(); // stop serving
+ try {
+ stopTomcat(); // stop serving
+ }
+ catch (TomcatException te) {
+ if (te.getRootCause() instanceof java.net.ConnectException)
+ System.out.println(sm.getString("tomcat.connectexception"));
+ else
+ throw te;
+ }
return;
}
@@ -202,6 +210,8 @@
String path = cm.getLogger().getPath();
if (path == null)
path = "console";
+ else
+ path = new File(path).getAbsolutePath();
System.out.println(sm.getString("tomcat.start", new Object[] { path }));
cm.init(); // set up contexts
@@ -216,7 +226,7 @@
}
catch (java.net.BindException be) {
log("Starting Tomcat: " + be.getMessage(), Logger.ERROR);
- System.out.println(sm.getString("tomcat.start.bindexception"));
+ System.out.println(sm.getString("tomcat.bindexception"));
}
}
1.4 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java
Index: StopTomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StopTomcat.java 2000/07/11 03:49:02 1.3
+++ StopTomcat.java 2000/07/11 07:29:21 1.4
@@ -112,7 +112,7 @@
os.write( stopMessage );
socket.close();
} catch(Exception ex ) {
- loghelper.log("Error stopping Tomcat with Ajp12", ex);
+ throw new TomcatException("Error stopping Tomcat with Ajp12", ex);
}
}