pero 2005/01/29 11:41:16
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java LocalStrings.properties
ContainerBase.java StandardService.java
StandardEngine.java
Log:
add some log.isXXXEnable and replace printStackTrace to log.error
Revision Changes Path
1.42 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- StandardServer.java 12 Jan 2005 17:45:03 -0000 1.41
+++ StandardServer.java 29 Jan 2005 19:41:16 -0000 1.42
@@ -316,7 +316,7 @@
try {
service.initialize();
} catch (LifecycleException e) {
- e.printStackTrace(System.err);
+ log.error(e);
}
}
1.18 +3 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LocalStrings.properties 15 Jan 2005 17:04:38 -0000 1.17
+++ LocalStrings.properties 29 Jan 2005 19:41:16 -0000 1.18
@@ -98,6 +98,7 @@
standardEngine.notStarted=Engine has not yet been started
standardEngine.unfoundHost=Virtual host {0} not found
standardEngine.unknownHost=No server host specified in this request
+standardEngine.unregister.mbeans.failed=Error in destroy() for mbean file {0}
standardHost.accessBase=Cannot access document base directory {0}
standardHost.alreadyStarted=Host has already been started
standardHost.appBase=Application base directory {0} does not exist
@@ -140,6 +141,8 @@
standardServer.start.started=This server has already been started
standardServer.stop.notStarted=This server has not yet been started
standardService.initialize.initialized=This service has already been
initialized
+standardService.initialize.failed=Service initializing at {0} failed
+standardService.register.failed=Error registering Service at domain {0}
standardService.start.name=Starting service {0}
standardService.start.started=This service has already been started
standardService.stop.name=Stopping service {0}
1.39 +6 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ContainerBase.java 3 Dec 2004 15:39:31 -0000 1.38
+++ ContainerBase.java 29 Jan 2005 19:41:16 -0000 1.39
@@ -980,7 +980,8 @@
// Validate and update our current component state
if (started) {
- log.info(sm.getString("containerBase.alreadyStarted",
logName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("containerBase.alreadyStarted",
logName()));
return;
}
@@ -1037,7 +1038,8 @@
// Validate and update our current component state
if (!started) {
- log.info(sm.getString("containerBase.notStarted", logName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("containerBase.notStarted",
logName()));
return;
}
@@ -1136,7 +1138,8 @@
if( controller == oname ) {
Registry.getRegistry(null, null)
.unregisterComponent(oname);
- log.debug("unregistering " + oname);
+ if(log.isDebugEnabled())
+ log.debug("unregistering " + oname);
}
} catch( Throwable t ) {
log.error("Error unregistering ", t );
1.17 +4 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardService.java 27 Dec 2004 09:43:14 -0000 1.16
+++ StandardService.java 29 Jan 2005 19:41:16 -0000 1.17
@@ -513,7 +513,7 @@
}
}
}
-
+ // FIXME pero -- Why container stop first? KeepAlive connetions can
send request!
// Stop our defined Connectors first
synchronized (connectors) {
for (int i = 0; i < connectors.length; i++) {
@@ -561,7 +561,7 @@
Registry.getRegistry(null, null)
.registerComponent(this, oname, null);
} catch (Exception e) {
- log.error("Error registering ",e);
+
log.error(sm.getString("standardService.register.failed",domain),e);
}
@@ -584,14 +584,14 @@
public void destroy() throws LifecycleException {
if( started ) stop();
- // unregister should be here probably
+ // FIXME unregister should be here probably -- stop doing that ?
}
public void init() {
try {
initialize();
} catch( Throwable t ) {
- t.printStackTrace();
+
log.error(sm.getString("standardService.initialize.failed",domain),t);
}
}
1.29 +7 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StandardEngine.java 27 Dec 2004 09:43:14 -0000 1.28
+++ StandardEngine.java 29 Jan 2005 19:41:16 -0000 1.29
@@ -41,7 +41,8 @@
/**
* Standard implementation of the <b>Engine</b> interface. Each
* child container must be a Host implementation to process the specific
- * fully qualified host name of that virtual host.
+ * fully qualified host name of that virtual host. <br/>
+ * You can set the jvmRoute direct or with the System.property
<b>jvmRoute</b>.
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
@@ -353,7 +354,7 @@
service.setContainer( this );
service.initialize();
} catch( Throwable t ) {
- t.printStackTrace();
+ log.error(t);
}
}
@@ -364,6 +365,7 @@
initialized=false;
// if we created it, make sure it's also destroyed
+ // this call implizit this.stop()
((StandardService)service).destroy();
if( mbeans != null ) {
@@ -371,7 +373,7 @@
Registry.getRegistry(null, null)
.invoke(mbeans, "destroy", false);
} catch (Exception e) {
- log.error("Error in destroy() for " + mbeansFile, e);
+
log.error(sm.getString("standardEngine.unregister.mbeans.failed" ,mbeansFile),
e);
}
}
//
@@ -382,7 +384,7 @@
.unregisterComponent((ObjectName)mbeans.get(i));
}
} catch (Exception e) {
- log.error("Error in destroy() for " + mbeansFile, e);
+
log.error(sm.getString("standardEngine.unregister.mbeans.failed", mbeansFile),
e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
