From: slaurent Date: Thu, 16 Dec 2010 20:40:36 +0000 (+0000) Subject: bug 48822: Include contest name in reload and stop log statements X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=164c1dc963f793365e155cecc30d0f75824c1a1e;p=tomcat7.0 bug 48822: Include contest name in reload and stop log statements https://issues.apache.org/bugzilla/show_bug.cgi?id=48822 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1050150 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties index 74d2dba7a..e3f001820 100644 --- a/java/org/apache/catalina/core/LocalStrings.properties +++ b/java/org/apache/catalina/core/LocalStrings.properties @@ -141,7 +141,8 @@ 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} -standardContext.stoppingContext=Exception stopping Context +standardContext.startingContext=Exception starting Context {0} +standardContext.stoppingContext=Exception stopping Context {0} standardContext.stoppingLoader=Exception stopping Loader standardContext.stoppingManager=Exception stopping Manager standardContext.stoppingWrapper=Exception stopping Wrapper for servlet {0} diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties b/java/org/apache/catalina/core/LocalStrings_es.properties index a8124e119..4a9d0a8c5 100644 --- a/java/org/apache/catalina/core/LocalStrings_es.properties +++ b/java/org/apache/catalina/core/LocalStrings_es.properties @@ -100,7 +100,7 @@ standardContext.parameter.duplicate = Duplicado par\u00E1metro de inicializaci\u standardContext.parameter.required = Es necesario poner nombre de par\u00E1metro y valor de par\u00E1metro standardContext.reloadingCompleted = Se ha completado la Regarga de este Contexto standardContext.reloadingFailed = Fall\u00F3 la recarga de este Contexto debido a errores previos -standardContext.reloadingStarted = Ha comenzado la recarga de este Contexto +standardContext.reloadingStarted = Ha comenzado la recarga de Contexto {0} standardContext.resourcesStart = Error arrancando Recursos est\u00E1ticos standardContext.securityConstraint.pattern = {0} inv\u00E1lida en restricci\u00F3n de seguridad standardContext.servletMap.name = El mapeo de Servlet especifica un nombre de servlet desconocido {0} @@ -110,7 +110,7 @@ standardContext.startFailed = Fall\u00F3 en arranque del Contexto [{0}] debido a standardContext.startingLoader = Excepci\u00F3n arrancando Cargador standardContext.startingManager = Excepci\u00F3n arrancando Gestor standardContext.startingWrapper = Excepci\u00F3n arrancando Arropador (Wrapper) para servlet {0} -standardContext.stoppingContext = Excepci\u00F3n parando Context +standardContext.stoppingContext = Excepci\u00F3n parando Context {0} standardContext.stoppingLoader = Excepci\u00F3n parando Cargador standardContext.stoppingManager = Excepci\u00F3n parando Gestor standardContext.stoppingWrapper = Excepci\u00F3n parando Arropador (Wrapper) para servlet {0} diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties index 8016ee98a..7ddc6bccd 100644 --- a/java/org/apache/catalina/core/LocalStrings_fr.properties +++ b/java/org/apache/catalina/core/LocalStrings_fr.properties @@ -78,7 +78,7 @@ standardContext.parameter.duplicate=Param\u00e8tre d''initialisation de contexte standardContext.parameter.required=Le nom de param\u00e8tre ainsi que la valeur du param\u00e8tre sont requis standardContext.reloadingCompleted=Le rechargement de ce contexte est termin\u00e9 standardContext.reloadingFailed=Le rechargement de ce contexte a \u00e9chou\u00e9 suite \u00e0 une erreur pr\u00e9c\u00e9dente -standardContext.reloadingStarted=Le rechargement de ce contexte a d\u00e9marr\u00e9 +standardContext.reloadingStarted=Le rechargement du contexte {0} a d\u00e9marr\u00e9 standardContext.requestListener.requestInit=Une exception lors de l''envoi de requ\u00eate a initi\u00e9 un \u00e9v\u00e8nement cycle de vie (lifecycle event) pour l''instance de classe \u00e0 l''\u00e9coute (listener) {0} standardContext.requestListener.requestDestroy=Une exception lors de l''envoi de requ\u00eate a d\u00e9truit un \u00e9v\u00e8nement cycle de vie (lifecycle event) pour l''instance de classe \u00e0 l''\u00e9coute (listener) {0} standardContext.securityConstraint.pattern= {0} invalide d''apr\u00e8s les contraintes de s\u00e9curit\u00e9 (security constraint) @@ -89,7 +89,8 @@ standardContext.startFailed=Erreur de d\u00e9marrage du contexte [{0}] suite aux standardContext.startingLoader=Exception an d\u00e9marrage du "Loader" standardContext.startingManager=Exception an d\u00e9marrage du "Manager" standardContext.startingWrapper=Exception an d\u00e9marrage de l''enrobeur (wrapper) de la servlet {0} -standardContext.stoppingContext=Exception \u00e0 l''arr\u00eat du "Context" +standardContext.startingContext=Exception lors du d\u00e9marrage du contexte {0} +standardContext.stoppingContext=Exception \u00e0 l''arr\u00eat du Context {0} standardContext.stoppingLoader=Exception \u00e0 l''arr\u00eat du "Loader" standardContext.stoppingManager=Exception \u00e0 l''arr\u00eat du "Manager" standardContext.stoppingWrapper=Exception \u00e0 l''arr\u00eat de l''enrobeur (wrapper) de la servlet {0} diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 111791fc4..71a2a5fdc 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -3649,13 +3649,15 @@ public class StandardContext extends ContainerBase try { stop(); } catch (LifecycleException e) { - log.error(sm.getString("standardContext.stoppingContext"), e); + log.error( + sm.getString("standardContext.stoppingContext", logName()), e); } try { start(); } catch (LifecycleException e) { - log.error(sm.getString("standardContext.startingContext"), e); + log.error( + sm.getString("standardContext.startingContext", logName()), e); } setPaused(false);