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

https://issues.apache.org/jira/browse/AMQ-4237 - new jmx and query and bstat commands 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431295 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-01-10 11:43:33 +00:00
parent df72ec5079
commit 1a1ebd965c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java
View File

@ -73,12 +73,12 @@ public class BstatCommand extends QueryCommand {
// Build the predefined option // Build the predefined option
queryTokens.add("--objname"); queryTokens.add("--objname");
queryTokens.add("Type=*,BrokerName=" + brokerName); queryTokens.add("type=*,brokerName=" + brokerName + ",*");
queryTokens.add("-xQTopic=ActiveMQ.Advisory.*"); queryTokens.add("-xQTopic=ActiveMQ.Advisory.*");
queryTokens.add("--view"); queryTokens.add("--view");
queryTokens.add("Type,BrokerName,Destination,ConnectorName,EnqueueCount," queryTokens.add("BrokerName,Name,connectorName,networkConnectorName,destinationName,destinationType,EnqueueCount,"
+ "DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages," + "DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages,"
+ "TotalMessages,ConsumerCount,TotalConsumerCount,DispatchQueueSize"); + "TotalMessageCount,ConsumerCount,TotalConsumerCount,DispatchCount,Duplex,NetworkTTL");
// Call the query command // Call the query command
super.parseOptions(queryTokens); super.parseOptions(queryTokens);

12
activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java
View File

@ -31,12 +31,12 @@ public class QueryCommand extends AbstractJmxCommand {
private static final Properties PREDEFINED_OBJNAME_QUERY = new Properties(); private static final Properties PREDEFINED_OBJNAME_QUERY = new Properties();
static { static {
PREDEFINED_OBJNAME_QUERY.setProperty("Broker", "Type=Broker,BrokerName=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("Broker", "type=Broker,brokerName=%1");
PREDEFINED_OBJNAME_QUERY.setProperty("Connection", "Type=Connection,Connection=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("Connection", "type=Broker,connector=clientConnectors,connectionName=%1,*");
PREDEFINED_OBJNAME_QUERY.setProperty("Connector", "Type=Connector,ConnectorName=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("Connector", "type=Broker,brokerName=*,connector=clientConnectors,connectorName=%1");
PREDEFINED_OBJNAME_QUERY.setProperty("NetworkConnector", "Type=NetworkConnector,BrokerName=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("NetworkConnector", "type=Broker,brokerName=%1,connector=networkConnectors,networkConnectorName=*");
PREDEFINED_OBJNAME_QUERY.setProperty("Queue", "Type=Queue,Destination=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("Queue", "type=Broker,brokerName=*,destinationType=Queue,destinationName=%1");
PREDEFINED_OBJNAME_QUERY.setProperty("Topic", "Type=Topic,Destination=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("Topic", "type=Broker,brokerName=*,destinationType=Topic,destinationName=%1,*");
}; };
protected String[] helpFile = new String[] { protected String[] helpFile = new String[] {

2
activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java
View File

@ -117,7 +117,7 @@ public final class JmxMBeansUtil {
// Use regular expressions to filter the query result // Use regular expressions to filter the query result
// Retrieve the attributes needed // Retrieve the attributes needed
// Retrieve the mbeans object name specified by the query // Retrieve the mbeans object name specified by the query
return new WildcardToRegExTransformFilter(new MBeansRegExQueryFilter(new MBeansAttributeQueryFilter(jmxConnection, attributes, new MBeansObjectNameQueryFilter(jmxConnection)))); return new MBeansAttributeQueryFilter(jmxConnection, attributes, new MBeansObjectNameQueryFilter(jmxConnection));
} }
public static QueryFilter createMessageQueryFilter(MBeanServerConnection jmxConnection, ObjectName destName) { public static QueryFilter createMessageQueryFilter(MBeanServerConnection jmxConnection, ObjectName destName) {