root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Allow user to disable all JMX exports with spring.jmx.enabled

This commit is contained in:
Dave Syer 2014-01-08 14:27:34 +00:00
parent 561cb3a50f
commit 7d846c835a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java
View File

@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
*/
@Configuration
@AutoConfigureAfter({ EndpointAutoConfiguration.class })
@ConditionalOnExpression("${endpoints.jmx.enabled:true}")
@ConditionalOnExpression("${endpoints.jmx.enabled:true}&&${spring.jmx.enabled:true}")
@EnableConfigurationProperties(EndpointMBeanExportProperties.class)
public class EndpointMBeanExportAutoConfiguration {
@ -55,7 +55,7 @@ public class EndpointMBeanExportAutoConfiguration {
mbeanExporter.setDomain(domain);
}
mbeanExporter.setEnsureUniqueRuntimeObjectNames(this.properties.getUniqueNames());
mbeanExporter.setEnsureUniqueRuntimeObjectNames(this.properties.isUniqueNames());
mbeanExporter.setObjectNameStaticProperties(this.properties.getStaticNames());
return mbeanExporter;
@ -68,8 +68,18 @@ public class EndpointMBeanExportAutoConfiguration {
private boolean uniqueNames = false;
private boolean enabled = true;
private Properties staticNames = new Properties();
public boolean isEnabled() {
return this.enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public String getDomain() {
return this.domain;
}
@ -78,7 +88,7 @@ public class EndpointMBeanExportAutoConfiguration {
this.domain = domain;
}
public boolean getUniqueNames() {
public boolean isUniqueNames() {
return this.uniqueNames;
}