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-5656 - add support for selective mbean suppression; refactor a bit so we can support patterns and wildcards

This commit is contained in:
Dejan Bosanac 2015-06-26 12:56:27 +02:00
parent 2c53dbcc63
commit 13c471cc11
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View File

@ -95,7 +95,7 @@ public class ManagementContext implements Service {
private boolean allowRemoteAddressInMBeanNames = true;
private String brokerName;
private String suppressMBean;
private List<Map.Entry<String,String>> suppressMBeanList;
private List<ObjectName> suppressMBeanList;
public ManagementContext() {
this(null);
@ -106,7 +106,7 @@ public class ManagementContext implements Service {
}
@Override
public void start() throws IOException {
public void start() throws Exception {
// lets force the MBeanServer to be created if needed
if (started.compareAndSet(false, true)) {
@ -168,27 +168,11 @@ public class ManagementContext implements Service {
}
}
private void populateMBeanSuppressionMap() {
private void populateMBeanSuppressionMap() throws Exception {
if (suppressMBean != null) {
suppressMBeanList = new LinkedList<>();
for (String pair : suppressMBean.split(",")) {
final String[] keyValue = pair.split("=");
suppressMBeanList.add(new Map.Entry<String, String>() {
@Override
public String getKey() {
return keyValue[0];
}
@Override
public String getValue() {
return keyValue[1];
}
@Override
public String setValue(String value) {
return null;
}
});
suppressMBeanList.add(new ObjectName(jmxDomainName + ":*," + pair));
}
}
}
@ -293,7 +277,7 @@ public class ManagementContext implements Service {
*
* @return the MBeanServer
*/
protected MBeanServer getMBeanServer() {
public MBeanServer getMBeanServer() {
if (this.beanServer == null) {
this.beanServer = findMBeanServer();
}
@ -430,8 +414,8 @@ public class ManagementContext implements Service {
private boolean isAllowedToRegister(ObjectName name) {
boolean result = true;
if (suppressMBean != null && suppressMBeanList != null) {
for (Map.Entry<String,String> attr : suppressMBeanList) {
if (attr.getValue().equals(name.getKeyProperty(attr.getKey()))) {
for (ObjectName attr : suppressMBeanList) {
if (attr.apply(name)) {
result = false;
break;
}

5
activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/SelectiveMBeanRegistrationTest.java
View File

@ -61,7 +61,7 @@ public class SelectiveMBeanRegistrationTest {
ManagementContext managementContext = new ManagementContext();
managementContext.setCreateConnector(false);
managementContext.setSuppressMBean("endpoint=dynamicProducer,endpoint=Consumer");
managementContext.setSuppressMBean("endpoint=dynamicProducer,endpoint=Consumer,destinationName=ActiveMQ.Advisory.*");
brokerService.setManagementContext(managementContext);
brokerService.start();
@ -111,6 +111,9 @@ public class SelectiveMBeanRegistrationTest {
Set<ObjectInstance> mbeans = mbeanServer.queryMBeans(query, null);
assertEquals(0, mbeans.size());
query = new ObjectName(domain + ":type=Broker,brokerName=localhost,destinationName=ActiveMQ.Advisory.*,*");
mbeans = mbeanServer.queryMBeans(query, null);
assertEquals(0, mbeans.size());
}