[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249 Lifecycle
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
AuthorDate: Thu Mar 14 12:12:47 2019 +
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.
-
[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
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 18b16d5 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
18b16d5 is described below
commit 18b16d5cdb1667132c5035aca2f08dced25a911c
Author: Mark Thomas
AuthorDate: Wed Mar 13 19:05:02 2019 +
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
Use a consistent log level (WARN) when logging the failure to register
or deregister a JMX Bean.
---
java/org/apache/catalina/core/ApplicationFilterConfig.java | 13 +
java/org/apache/catalina/core/StandardWrapper.java | 8 +++-
java/org/apache/catalina/loader/WebappLoader.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 4 ++--
webapps/docs/changelog.xml | 8
5 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index ce53f30..6c29234 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -388,29 +388,26 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
}
try {
oname = new ObjectName(onameStr);
-Registry.getRegistry(null, null).registerComponent(this, oname,
-null);
+Registry.getRegistry(null, null).registerComponent(this, oname,
null);
} catch (Exception ex) {
-log.info(sm.getString("applicationFilterConfig.jmxRegisterFail",
+log.warn(sm.getString("applicationFilterConfig.jmxRegisterFail",
getFilterClass(), getFilterName()), ex);
}
}
+
private void unregisterJMX() {
// unregister this component
if (oname != null) {
try {
Registry.getRegistry(null, null).unregisterComponent(oname);
if (log.isDebugEnabled())
-log.debug(sm.getString(
-"applicationFilterConfig.jmxUnregister",
+
log.debug(sm.getString("applicationFilterConfig.jmxUnregister",
getFilterClass(), getFilterName()));
} catch(Exception ex) {
-log.error(sm.getString(
-"applicationFilterConfig.jmxUnregisterFail",
+
log.warn(sm.getString("applicationFilterConfig.jmxUnregisterFail",
getFilterClass(), getFilterName()), ex);
}
}
-
}
}
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 5e31581..806a90d 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1000,11 +1000,9 @@ public class StandardWrapper extends ContainerBase
try {
jspMonitorON = new ObjectName(oname.toString());
-Registry.getRegistry(null, null)
-.registerComponent(instance, jspMonitorON, null);
-} catch( Exception ex ) {
-log.info("Error registering JSP monitoring with jmx " +
- instance);
+Registry.getRegistry(null, null).registerComponent(instance,
jspMonitorON, null);
+} catch (Exception ex) {
+log.warn("Error registering JSP monitoring with jmx " +
instance);
}
}
}
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index 7de7822..c55229a 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -459,7 +459,7 @@ public class WebappLoader extends LifecycleMBeanBase
context.getParent().getName() + ",context=" +
contextName);
Registry.getRegistry(null, null).unregisterComponent(cloname);
} catch (Exception e) {
-log.error("LifecycleException ", e);
+log.warn("LifecycleException ", e);
}
}
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 9b1c693..b00c3ae 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1565,7 +1565,7 @@ public class HostConfig implements LifecycleListener {
Registry.getRegistry(null, null).registerComponent
(this, oname, this.getClass().getName());
} catch (Exception e) {
-log.error(sm.getString("hostConfig.jmx.register",
