You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/05/18 08:44:17 UTC
[tomcat] branch 8.5.x updated: Send failed JMX notification
This is an automated email from the ASF dual-hosted git repository.
remm 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 1c61a5a Send failed JMX notification
1c61a5a is described below
commit 1c61a5a66fe0eab305a2d0234a4833cd50ff5a82
Author: remm <re...@apache.org>
AuthorDate: Mon May 18 10:33:29 2020 +0200
Send failed JMX notification
Code cleanup. Remove i18n todo, I doubt it is a good idea at all for
JMX, the descriptions are read by a client which may not like the server
language (the manager webapp uses the client language, for example).
---
java/org/apache/catalina/core/StandardContext.java | 94 ++++++++++------------
java/org/apache/catalina/core/StandardWrapper.java | 61 ++++++--------
2 files changed, 68 insertions(+), 87 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index a4adfa6..6a3e1e0 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2789,7 +2789,6 @@ public class StandardContext extends ContainerBase
}
fireContainerEvent("addApplicationListener", listener);
- // FIXME - add instance if already started?
}
@@ -3006,12 +3005,6 @@ public class StandardContext extends ContainerBase
(servletNames.length == 0) && (urlPatterns.length == 0))
throw new IllegalArgumentException
(sm.getString("standardContext.filterMap.either"));
- // FIXME: Older spec revisions may still check this
- /*
- if ((servletNames.length != 0) && (urlPatterns.length != 0))
- throw new IllegalArgumentException
- (sm.getString("standardContext.filterMap.either"));
- */
for (String urlPattern : urlPatterns) {
if (!validateURLPattern(urlPattern)) {
throw new IllegalArgumentException
@@ -3807,7 +3800,6 @@ public class StandardContext extends ContainerBase
// Inform interested listeners
fireContainerEvent("removeApplicationListener", listener);
- // FIXME - behavior if already started?
}
@@ -5234,6 +5226,12 @@ public class StandardContext extends ContainerBase
// Reinitializing if something went wrong
if (!ok) {
setState(LifecycleState.FAILED);
+ // Send j2ee.object.failed notification
+ if (this.getObjectName() != null) {
+ Notification notification = new Notification("j2ee.object.failed",
+ this.getObjectName(), sequenceNumber.getAndIncrement());
+ broadcaster.sendNotification(notification);
+ }
} else {
setState(LifecycleState.STARTING);
}
@@ -5476,7 +5474,8 @@ public class StandardContext extends ContainerBase
}
- /** Destroy needs to clean up the context completely.
+ /**
+ * Destroy needs to clean up the context completely.
*
* The problem is that undoing all the config in start() and restoring
* a 'fresh' state is impossible. After stop()/destroy()/init()/start()
@@ -5484,9 +5483,6 @@ public class StandardContext extends ContainerBase
* read modified web.xml, etc. This can only be done by completely
* removing the context object and remapping a new one, or by cleaning
* up everything.
- *
- * XXX Should this be done in stop() ?
- *
*/
@Override
protected void destroyInternal() throws LifecycleException {
@@ -6209,7 +6205,8 @@ public class StandardContext extends ContainerBase
}
- /* Remove a JMX notificationListener
+ /**
+ * Remove a JMX notificationListener
* @see javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
*/
@Override
@@ -6220,48 +6217,43 @@ public class StandardContext extends ContainerBase
private MBeanNotificationInfo[] notificationInfo;
- /* Get JMX Broadcaster Info
- * @TODO use StringManager for international support!
- * @TODO This two events we not send j2ee.state.failed and j2ee.attribute.changed!
+ /**
+ * Get JMX Broadcaster Info
* @see javax.management.NotificationBroadcaster#getNotificationInfo()
*/
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
- // FIXME: i18n
- if(notificationInfo == null) {
- notificationInfo = new MBeanNotificationInfo[]{
- new MBeanNotificationInfo(new String[] {
- "j2ee.object.created"},
- Notification.class.getName(),
- "web application is created"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.state.starting"},
- Notification.class.getName(),
- "change web application is starting"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.state.running"},
- Notification.class.getName(),
- "web application is running"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.state.stopping"},
- Notification.class.getName(),
- "web application start to stopped"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.object.stopped"},
- Notification.class.getName(),
- "web application is stopped"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.object.deleted"},
- Notification.class.getName(),
- "web application is deleted"
- )
- };
-
+ // FIXME: we not send j2ee.attribute.changed
+ if (notificationInfo == null) {
+ notificationInfo = new MBeanNotificationInfo[] {
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.created" },
+ Notification.class.getName(),
+ "web application is created"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.state.starting" },
+ Notification.class.getName(),
+ "change web application is starting"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.state.running" },
+ Notification.class.getName(),
+ "web application is running"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.state.stopping" },
+ Notification.class.getName(),
+ "web application start to stopped"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.stopped" },
+ Notification.class.getName(),
+ "web application is stopped"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.deleted" },
+ Notification.class.getName(),
+ "web application is deleted"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.failed" },
+ Notification.class.getName(),
+ "web application failed") };
}
return notificationInfo;
diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index 6439ada..62fc55a 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1732,47 +1732,36 @@ public class StandardWrapper extends ContainerBase
/**
* Get JMX Broadcaster Info
- * FIXME: This two events we not send j2ee.state.failed and j2ee.attribute.changed!
* @see javax.management.NotificationBroadcaster#getNotificationInfo()
*/
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
-
- if(notificationInfo == null) {
- notificationInfo = new MBeanNotificationInfo[]{
- new MBeanNotificationInfo(new String[] {
- "j2ee.object.created"},
- Notification.class.getName(),
- "servlet is created"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.state.starting"},
- Notification.class.getName(),
- "servlet is starting"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.state.running"},
- Notification.class.getName(),
- "servlet is running"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.state.stopped"},
- Notification.class.getName(),
- "servlet start to stopped"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.object.stopped"},
- Notification.class.getName(),
- "servlet is stopped"
- ),
- new MBeanNotificationInfo(new String[] {
- "j2ee.object.deleted"},
- Notification.class.getName(),
- "servlet is deleted"
- )
- };
+ // FIXME: we not send j2ee.state.failed
+ // FIXME: we not send j2ee.attribute.changed
+ if (notificationInfo == null) {
+ notificationInfo = new MBeanNotificationInfo[] {
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.created" },
+ Notification.class.getName(), "servlet is created"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.state.starting" },
+ Notification.class.getName(),
+ "servlet is starting"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.state.running" },
+ Notification.class.getName(), "servlet is running"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.state.stopped" },
+ Notification.class.getName(),
+ "servlet start to stopped"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.stopped" },
+ Notification.class.getName(), "servlet is stopped"),
+ new MBeanNotificationInfo(
+ new String[] { "j2ee.object.deleted" },
+ Notification.class.getName(),
+ "servlet is deleted") };
}
-
return notificationInfo;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org