This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new e992e52 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle e992e52 is described below commit e992e52f8d6e820fb905d806893a1d4868133a69 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Mar 14 12:12:47 2019 +0000 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle Use a consistent log level (ERROR) when logging the LifecycleException associated with the failure to start or stop a component. --- java/org/apache/catalina/core/StandardContext.java | 4 ++-- java/org/apache/catalina/core/StandardService.java | 8 ++++---- java/org/apache/catalina/startup/HostConfig.java | 3 +-- java/org/apache/catalina/util/LifecycleBase.java | 3 +-- webapps/docs/changelog.xml | 5 +++++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 7533d77..e425076 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -2057,7 +2057,7 @@ public class StandardContext extends ContainerBase oldNamingResources.stop(); oldNamingResources.destroy(); } catch (LifecycleException e) { - log.warn("standardContext.namingResource.destroy.fail", e); + log.error(sm.getString("standardContext.namingResource.destroy.fail"), e); } } if (namingResources != null) { @@ -2065,7 +2065,7 @@ public class StandardContext extends ContainerBase namingResources.init(); namingResources.start(); } catch (LifecycleException e) { - log.warn("standardContext.namingResource.init.fail", e); + log.error(sm.getString("standardContext.namingResource.init.fail"), e); } } } diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java index fd715e2..5de00bd 100644 --- a/java/org/apache/catalina/core/StandardService.java +++ b/java/org/apache/catalina/core/StandardService.java @@ -134,25 +134,25 @@ public class StandardService extends LifecycleMBeanBase implements Service { try { this.engine.start(); } catch (LifecycleException e) { - log.warn(sm.getString("standardService.engine.startFailed"), e); + log.error(sm.getString("standardService.engine.startFailed"), e); } } // Restart MapperListener to pick up new engine. try { mapperListener.stop(); } catch (LifecycleException e) { - log.warn(sm.getString("standardService.mapperListener.stopFailed"), e); + log.error(sm.getString("standardService.mapperListener.stopFailed"), e); } try { mapperListener.start(); } catch (LifecycleException e) { - log.warn(sm.getString("standardService.mapperListener.startFailed"), e); + log.error(sm.getString("standardService.mapperListener.startFailed"), e); } if (oldEngine != null) { try { oldEngine.stop(); } catch (LifecycleException e) { - log.warn(sm.getString("standardService.engine.stopFailed"), e); + log.error(sm.getString("standardService.engine.stopFailed"), e); } } } diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index b00c3ae..48154f3 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -1413,8 +1413,7 @@ public class HostConfig implements LifecycleListener { try { context.start(); } catch (Exception e) { - log.warn(sm.getString - ("hostConfig.context.restart", app.name), e); + log.error(sm.getString("hostConfig.context.restart", app.name), e); } } } diff --git a/java/org/apache/catalina/util/LifecycleBase.java b/java/org/apache/catalina/util/LifecycleBase.java index 0b6e77e..6ccbdb4 100644 --- a/java/org/apache/catalina/util/LifecycleBase.java +++ b/java/org/apache/catalina/util/LifecycleBase.java @@ -264,8 +264,7 @@ public abstract class LifecycleBase implements Lifecycle { stop(); } catch (LifecycleException e) { // Just log. Still want to destroy. - log.warn(sm.getString( - "lifecycleBase.destroyStopFail", toString()), e); + log.error(sm.getString("lifecycleBase.destroyStopFail", toString()), e); } } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d0c9396..38e2884 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -56,6 +56,11 @@ <bug>63249</bug>: Use a consistent log level (<code>WARN</code>) when logging the failure to register or deregister a JMX Bean. (markt) </fix> + <fix> + <bug>63249</bug>: Use a consistent log level (<code>ERROR</code>) when + logging the <code>LifecycleException</code> associated with the failure + to start or stop a component. (markt) + </fix> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org