remm 2005/03/22 02:32:07
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java LocalStrings_fr.properties
LocalStrings_ja.properties LocalStrings.properties
LocalStrings_es.properties
Log:
- Improve logging of startup errors.
Revision Changes Path
1.168 +20 -23
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- StandardContext.java 11 Mar 2005 17:00:28 -0000 1.167
+++ StandardContext.java 22 Mar 2005 10:32:07 -0000 1.168
@@ -3514,8 +3514,8 @@
*/
public boolean filterStart() {
- if (log.isDebugEnabled())
- log.debug("Starting filters");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("Starting filters");
// Instantiate and record a FilterConfig for each defined filter
boolean ok = true;
synchronized (filterConfigs) {
@@ -3523,15 +3523,15 @@
Iterator names = filterDefs.keySet().iterator();
while (names.hasNext()) {
String name = (String) names.next();
- if (log.isDebugEnabled())
- log.debug(" Starting filter '" + name + "'");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug(" Starting filter '" + name + "'");
ApplicationFilterConfig filterConfig = null;
try {
filterConfig = new ApplicationFilterConfig
(this, (FilterDef) filterDefs.get(name));
filterConfigs.put(name, filterConfig);
} catch (Throwable t) {
- getServletContext().log
+ getLogger().error
(sm.getString("standardContext.filterStart", name),
t);
ok = false;
}
@@ -3550,16 +3550,16 @@
*/
public boolean filterStop() {
- if (log.isDebugEnabled())
- log.debug("Stopping filters");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("Stopping filters");
// Release all Filter and FilterConfig instances
synchronized (filterConfigs) {
Iterator names = filterConfigs.keySet().iterator();
while (names.hasNext()) {
String name = (String) names.next();
- if (log.isDebugEnabled())
- log.debug(" Stopping filter '" + name + "'");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug(" Stopping filter '" + name + "'");
ApplicationFilterConfig filterConfig =
(ApplicationFilterConfig) filterConfigs.get(name);
filterConfig.release();
@@ -3600,21 +3600,21 @@
Object results[] = new Object[listeners.length];
boolean ok = true;
for (int i = 0; i < results.length; i++) {
- if (log.isDebugEnabled())
- log.debug(" Configuring event listener class '" +
+ if (getLogger().isDebugEnabled())
+ getLogger().debug(" Configuring event listener class '" +
listeners[i] + "'");
try {
Class clazz = loader.loadClass(listeners[i]);
results[i] = clazz.newInstance();
} catch (Throwable t) {
- getServletContext().log
+ getLogger().error
(sm.getString("standardContext.applicationListener",
listeners[i]), t);
ok = false;
}
}
if (!ok) {
- log.error(sm.getString("standardContext.applicationSkipped"));
+
getLogger().error(sm.getString("standardContext.applicationSkipped"));
return (false);
}
@@ -3639,8 +3639,8 @@
// Send application start events
- if (log.isDebugEnabled())
- log.debug("Sending application start events");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("Sending application start events");
Object instances[] = getApplicationLifecycleListeners();
if (instances == null)
@@ -3660,7 +3660,7 @@
fireContainerEvent("afterContextInitialized", listener);
} catch (Throwable t) {
fireContainerEvent("afterContextInitialized", listener);
- getServletContext().log
+ getLogger().error
(sm.getString("standardContext.listenerStart",
instances[i].getClass().getName()), t);
ok = false;
@@ -3701,7 +3701,7 @@
fireContainerEvent("afterContextDestroyed", listener);
} catch (Throwable t) {
fireContainerEvent("afterContextDestroyed", listener);
- getServletContext().log
+ getLogger().error
(sm.getString("standardContext.listenerStop",
listeners[j].getClass().getName()), t);
ok = false;
@@ -3846,8 +3846,7 @@
try {
wrapper.load();
} catch (ServletException e) {
- getServletContext().log
- (sm.getString("standardWrapper.loadException",
+
getLogger().error(sm.getString("standardWrapper.loadException",
getName()),
StandardWrapper.getRootCause(e));
// NOTE: load errors (including a servlet that throws
// UnavailableException from tht init() method) are NOT
@@ -4082,8 +4081,6 @@
// Create context attributes that will be required
if (ok) {
- if (log.isDebugEnabled())
- log.debug("Posting standard context attributes");
postWelcomeFiles();
}
@@ -4120,7 +4117,7 @@
log.debug("Starting completed");
setAvailable(true);
} else {
- log.error(sm.getString("standardContext.startFailed"));
+ log.error(sm.getString("standardContext.startFailed",
getName()));
try {
stop();
} catch (Throwable t) {
1.7 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_fr.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings_fr.properties 15 Jan 2005 17:04:38 -0000 1.6
+++ LocalStrings_fr.properties 22 Mar 2005 10:32:07 -0000 1.7
@@ -68,7 +68,7 @@
standardContext.servletMap.name=L''association de servlet (servlet mapping)
indique un nom de servlet inconnu {0}
standardContext.servletMap.pattern=<url-pattern> {0} invalide dans
l''association de servlet (servlet mapping)
standardContext.startCleanup=Exception lors du nettoyage après que le
démarrage ait échoué
-standardContext.startFailed=Erreur de démarrage du contexte suite aux
erreurs précédentes
+standardContext.startFailed=Erreur de démarrage du contexte [{0}] suite aux
erreurs précédentes
standardContext.startingLoader=Exception an démarrage du "Loader"
standardContext.startingManager=Exception an démarrage du "Manager"
standardContext.startingWrapper=Exception an démarrage de l''enrobeur
(wrapper) de la servlet {0}
1.10 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LocalStrings_ja.properties 15 Jan 2005 16:51:35 -0000 1.9
+++ LocalStrings_ja.properties 22 Mar 2005 10:32:07 -0000 1.10
@@ -70,7 +70,7 @@
standardContext.servletMap.name=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u672a\u77e5\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d
{0} \u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059
standardContext.servletMap.pattern=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306b\u7121\u52b9\u306a
<url-pattern> {0} \u304c\u3042\u308a\u307e\u3059
standardContext.startCleanup=\u8d77\u52d5\u304c\u5931\u6557\u3057\u305f\u5f8c\u306e\u30af\u30ea\u30fc\u30f3\u30ca\u30c3\u30d7\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-standardContext.startFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u8d77\u52d5\u304c\u5931\u6557\u3057\u307e\u3057\u305f
+standardContext.startFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u8d77\u52d5\u304c\u5931\u6557\u3057\u307e\u3057\u305f
[{0}]
standardContext.startingLoader=\u30ed\u30fc\u30c0\u3092\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059
standardContext.startingManager=\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059
standardContext.startingWrapper=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306e\u30e9\u30c3\u30d1\u3092\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059
1.19 +1 -1
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LocalStrings.properties 29 Jan 2005 19:41:16 -0000 1.18
+++ LocalStrings.properties 22 Mar 2005 10:32:07 -0000 1.19
@@ -76,7 +76,7 @@
standardContext.servletMap.name=Servlet mapping specifies an unknown servlet
name {0}
standardContext.servletMap.pattern=Invalid <url-pattern> {0} in servlet
mapping
standardContext.startCleanup=Exception during cleanup after start failed
-standardContext.startFailed=Context startup failed due to previous errors
+standardContext.startFailed=Context [{0}] startup failed due to previous
errors
standardContext.startingLoader=Exception starting Loader
standardContext.startingManager=Exception starting Manager
standardContext.startingWrapper=Exception starting Wrapper for servlet {0}
1.5 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties
Index: LocalStrings_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings_es.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_es.properties 15 Jan 2005 17:04:38 -0000 1.4
+++ LocalStrings_es.properties 22 Mar 2005 10:32:07 -0000 1.5
@@ -70,7 +70,7 @@
standardContext.servletMap.name=El mapeo de Servlet especifica un nombre de
servlet desconocido {0}
standardContext.servletMap.pattern=<url-pattern> {0} inválida en mapeo de
servlet
standardContext.startCleanup=Excepción durante la limpieza tras no poder
arrancar
-standardContext.startFailed=Falló en arranque del Contexto debido a errores
previos
+standardContext.startFailed=Falló en arranque del Contexto [{0}] debido a
errores previos
standardContext.startingLoader=Excepción arrancando Cargador
standardContext.startingManager=Excepción arrancando Gestor
standardContext.startingWrapper=Excepción arrancando Arropador (Wrapper)
para servlet {0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
