Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #838 from lucastetreault/console-consumers 

[AMQ-8597] Show active consumers in web console
This commit is contained in:
Jean-Baptiste Onofré 2022-07-22 15:54:54 +02:00 committed by GitHub
parent c670247388 4cedd80774
commit e04faac37d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
View File

@ -240,8 +240,9 @@ public abstract class BrokerFacadeSupport implements BrokerFacade {
public Collection<SubscriptionViewMBean> getQueueConsumers(String queueName) throws Exception {
String brokerName = getBrokerName();
queueName = StringUtils.replace(queueName, "\"", "_");
ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=\"" + brokerName
+ "\",destinationType=Queue,destinationName=\"" + queueName + "\",endpoint=Consumer,*");
queueName = StringUtils.replace(queueName, ":", "_");
ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=" + brokerName
+ ",destinationType=Queue,destinationName=" + queueName + ",endpoint=Consumer,*");
Set<ObjectName> queryResult = queryNames(query, null);
return getManagedObjects(queryResult.toArray(new ObjectName[queryResult.size()]), SubscriptionViewMBean.class);
}
@ -251,8 +252,9 @@ public abstract class BrokerFacadeSupport implements BrokerFacade {
public Collection<ProducerViewMBean> getQueueProducers(String queueName) throws Exception {
String brokerName = getBrokerName();
queueName = StringUtils.replace(queueName, "\"", "_");
ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=\"" + brokerName
+ "\",destinationType=Queue,destinationName=\"" + queueName + "\",endpoint=Producer,*");
queueName = StringUtils.replace(queueName, ":", "_");
ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=" + brokerName
+ ",destinationType=Queue,destinationName=" + queueName + ",endpoint=Producer,*");
Set<ObjectName> queryResult = queryNames(query, null);
return getManagedObjects(queryResult.toArray(new ObjectName[queryResult.size()]), ProducerViewMBean.class);
}
@ -262,6 +264,7 @@ public abstract class BrokerFacadeSupport implements BrokerFacade {
public Collection<ProducerViewMBean> getTopicProducers(String topicName) throws Exception {
String brokerName = getBrokerName();
topicName = StringUtils.replace(topicName, "\"", "_");
topicName = StringUtils.replace(topicName, ":", "_");
ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=" + brokerName
+ ",destinationType=Topic,destinationName=" + topicName + ",endpoint=Producer,*");
Set<ObjectName> queryResult = queryNames(query, null);

57
activemq-web/src/test/java/org/apache/activemq/web/BrokerFacadeSupportTest.java Normal file
View File

@ -0,0 +1,57 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.web;
import org.apache.activemq.broker.BrokerTestSupport;
import org.apache.activemq.broker.StubConnection;
import org.apache.activemq.broker.jmx.SubscriptionViewMBean;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.SessionInfo;
import java.util.Collection;
public class BrokerFacadeSupportTest extends BrokerTestSupport {
public void testGetQueueConsumerWorksWithSimpleQueue() throws Exception {
ActiveMQDestination destination = new ActiveMQQueue("TEST");
setupConsumer(destination);
BrokerFacadeSupport brokerFacadeSupport = new LocalBrokerFacade(broker);
Collection<SubscriptionViewMBean> subscriptionViewMBeans = brokerFacadeSupport.getQueueConsumers("TEST");
assertEquals(1, subscriptionViewMBeans.size());
}
public void testGetQueueConsumerWorksWithQueueWithColon() throws Exception {
ActiveMQDestination destination = new ActiveMQQueue("TEST:TEST");
setupConsumer(destination);
BrokerFacadeSupport brokerFacadeSupport = new LocalBrokerFacade(broker);
Collection<SubscriptionViewMBean> subscriptionViewMBeans = brokerFacadeSupport.getQueueConsumers("TEST:TEST");
assertEquals(1, subscriptionViewMBeans.size());
}
private void setupConsumer(ActiveMQDestination destination) throws Exception {
StubConnection connection1 = createConnection();
ConnectionInfo connectionInfo1 = createConnectionInfo();
SessionInfo sessionInfo1 = createSessionInfo(connectionInfo1);
connection1.send(connectionInfo1);
connection1.send(sessionInfo1);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination);
consumerInfo1.setPrefetchSize(1);
connection1.request(consumerInfo1);
}
}