This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c3fccde Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
Lifecycle
c3fccde is described below
commit c3fccdec0f5927d7cad4c9a81e0c1c1aed21b9d3
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 5885b02..2753ff8 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2051,7 +2051,7 @@ public class StandardContext extends ContainerBase
oldNamingResources.stop();
oldNamingResources.destroy();
} catch (LifecycleException e) {
-
log.warn(sm.getString("standardContext.namingResource.destroy.fail"), e);
+
log.error(sm.getString("standardContext.namingResource.destroy.fail"), e);
}
}
if (namingResources != null) {
@@ -2059,7 +2059,7 @@ public class StandardContext extends ContainerBase
namingResources.init();
namingResources.start();
} catch (LifecycleException e) {
-
log.warn(sm.getString("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 4ed923d..0a57a17 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 bed8200..28a3231 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1411,8 +1411,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 65f454a..8ea4d65 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -293,8 +293,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 fdc1770..5e2a803 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
