This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 1d3931d Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
Lifecycle
1d3931d is described below
commit 1d3931d7ebb0ae278d7bbb09efdcada71ea7a935
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/startup/HostConfig.java | 3 +--
java/org/apache/catalina/util/LifecycleBase.java | 3 +--
webapps/docs/changelog.xml | 5 +++++
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 0de8aad..d158e76 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2280,7 +2280,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) {
@@ -2288,7 +2288,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/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index e977e8f..0c66896 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1583,8 +1583,7 @@ public class HostConfig
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 a4cd46b..faba205 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -259,8 +259,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 b7808c1..3256fba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -93,6 +93,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>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
