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 0c8b133 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63249
0c8b133 is described below
commit 0c8b1336c286936957d166ea24edc5cc141c4eb7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 13 19:05:02 2019 +0000
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 | 5 ++---
java/org/apache/catalina/loader/WebappLoader.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 4 ++--
webapps/docs/changelog.xml | 8 ++++++++
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index cb3186c..7c2ea61 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -357,30 +357,27 @@ 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 c20d076..a28dd73 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -988,10 +988,9 @@ public class StandardWrapper extends ContainerBase
try {
jspMonitorON = new ObjectName(oname.toString());
- Registry.getRegistry(null, null)
- .registerComponent(instance, jspMonitorON, null);
+ Registry.getRegistry(null, null).registerComponent(instance,
jspMonitorON, null);
} catch (Exception ex) {
- log.info(sm.getString("standardWrapper.jspMonitorError",
instance));
+ log.warn(sm.getString("standardWrapper.jspMonitorError",
instance));
}
}
}
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index a035e77..0080778 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -455,7 +455,7 @@ public class WebappLoader extends LifecycleMBeanBase
context.getParent().getName() + ",context=" +
contextName);
Registry.getRegistry(null, null).unregisterComponent(cloname);
} catch (Exception e) {
- log.error(sm.getString("webappLoader.stopError"), e);
+ log.warn(sm.getString("webappLoader.stopError"), e);
}
}
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index f9d8660..bed8200 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1563,7 +1563,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", oname), e);
+ log.warn(sm.getString("hostConfig.jmx.register", oname), e);
}
if (!host.getAppBaseFile().isDirectory()) {
@@ -1591,7 +1591,7 @@ public class HostConfig implements LifecycleListener {
try {
Registry.getRegistry(null, null).unregisterComponent(oname);
} catch (Exception e) {
- log.error(sm.getString("hostConfig.jmx.unregister", oname), e);
+ log.warn(sm.getString("hostConfig.jmx.unregister", oname), e);
}
}
oname = null;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 36f296e..1a7e428 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.18 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>63249</bug>: Use a consistent log level (<code>WARN</code>) when
+ logging the failure to register or deregister a JMX Bean. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.17 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
