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 <[email protected]>
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 | 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", oname), e);
+ log.warn(sm.getString("hostConfig.jmx.register", oname), e);
}
if (!host.getAppBaseFile().isDirectory()) {
@@ -1593,7 +1593,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 a7be939..8013973 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 8.5.40 (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 8.5.39 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
