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

Polish

This commit is contained in:
Christian Dupuis 2014-05-22 17:31:31 +02:00
parent 344fb4616d
commit f9aeb6aefe
14 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
View File

@ -109,8 +109,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public EndpointHandlerMapping endpointHandlerMapping() { public EndpointHandlerMapping endpointHandlerMapping() {
EndpointHandlerMapping mapping = new EndpointHandlerMapping( EndpointHandlerMapping mapping = new EndpointHandlerMapping(mvcEndpoints()
mvcEndpoints().getEndpoints()); .getEndpoints());
boolean disabled = ManagementServerPort.get(this.applicationContext) != ManagementServerPort.SAME; boolean disabled = ManagementServerPort.get(this.applicationContext) != ManagementServerPort.SAME;
mapping.setDisabled(disabled); mapping.setDisabled(disabled);
if (!disabled) { if (!disabled) {
@ -169,7 +169,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
public HealthMvcEndpoint healthMvcEndpoint(HealthEndpoint delegate) { public HealthMvcEndpoint healthMvcEndpoint(HealthEndpoint delegate) {
HealthMvcEndpoint healthMvcEndpoint = new HealthMvcEndpoint(delegate); HealthMvcEndpoint healthMvcEndpoint = new HealthMvcEndpoint(delegate);
if (this.healthMvcEndpointProperties.getMapping() != null) { if (this.healthMvcEndpointProperties.getMapping() != null) {
healthMvcEndpoint.setStatusMapping(this.healthMvcEndpointProperties.getMapping()); healthMvcEndpoint.setStatusMapping(this.healthMvcEndpointProperties
.getMapping());
} }
return healthMvcEndpoint; return healthMvcEndpoint;
} }
@ -205,7 +206,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
// Ensure close on the parent also closes the child // Ensure close on the parent also closes the child
if (this.applicationContext instanceof ConfigurableApplicationContext) { if (this.applicationContext instanceof ConfigurableApplicationContext) {
((ConfigurableApplicationContext) this.applicationContext).addApplicationListener(new ApplicationListener<ContextClosedEvent>() { ((ConfigurableApplicationContext) this.applicationContext)
.addApplicationListener(new ApplicationListener<ContextClosedEvent>() {
@Override @Override
public void onApplicationEvent(ContextClosedEvent event) { public void onApplicationEvent(ContextClosedEvent event) {
@ -217,13 +219,15 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
} }
try { try {
childContext.refresh(); childContext.refresh();
} catch (RuntimeException ex) { }
catch (RuntimeException ex) {
// No support currently for deploying a war with management.port=<different>, // No support currently for deploying a war with management.port=<different>,
// and this is the signature of that happening // and this is the signature of that happening
if (ex instanceof EmbeddedServletContainerException if (ex instanceof EmbeddedServletContainerException
|| ex.getCause() instanceof EmbeddedServletContainerException) { || ex.getCause() instanceof EmbeddedServletContainerException) {
logger.warn("Could not start embedded container (management endpoints are still available through JMX)"); logger.warn("Could not start embedded container (management endpoints are still available through JMX)");
} else { }
else {
throw ex; throw ex;
} }
} }
@ -238,14 +242,17 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
ServerProperties serverProperties; ServerProperties serverProperties;
try { try {
serverProperties = beanFactory.getBean(ServerProperties.class); serverProperties = beanFactory.getBean(ServerProperties.class);
} catch (NoSuchBeanDefinitionException ex) { }
catch (NoSuchBeanDefinitionException ex) {
serverProperties = new ServerProperties(); serverProperties = new ServerProperties();
} }
ManagementServerProperties managementServerProperties; ManagementServerProperties managementServerProperties;
try { try {
managementServerProperties = beanFactory.getBean(ManagementServerProperties.class); managementServerProperties = beanFactory
} catch (NoSuchBeanDefinitionException ex) { .getBean(ManagementServerProperties.class);
}
catch (NoSuchBeanDefinitionException ex) {
managementServerProperties = new ManagementServerProperties(); managementServerProperties = new ManagementServerProperties();
} }

3
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java
View File

@ -48,7 +48,8 @@ public class HealthEndpoint extends AbstractEndpoint<Health> {
if (healthIndicators.size() == 1) { if (healthIndicators.size() == 1) {
this.healthIndicator = healthIndicators.values().iterator().next(); this.healthIndicator = healthIndicators.values().iterator().next();
} else { }
else {
CompositeHealthIndicator healthIndicator = new CompositeHealthIndicator( CompositeHealthIndicator healthIndicator = new CompositeHealthIndicator(
healthAggregator); healthAggregator);
for (Map.Entry<String, HealthIndicator> h : healthIndicators.entrySet()) { for (Map.Entry<String, HealthIndicator> h : healthIndicators.entrySet()) {

6
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
View File

@ -67,8 +67,10 @@ public class OrderedHealthAggregator implements HealthAggregator {
@Override @Override
public int compare(Status s1, Status s2) { public int compare(Status s1, Status s2) {
return Integer.valueOf( return Integer.valueOf(
OrderedHealthAggregator.this.statusOrder.indexOf(s1.getCode())).compareTo( OrderedHealthAggregator.this.statusOrder.indexOf(s1.getCode()))
Integer.valueOf(OrderedHealthAggregator.this.statusOrder.indexOf(s2.getCode()))); .compareTo(
Integer.valueOf(OrderedHealthAggregator.this.statusOrder
.indexOf(s2.getCode())));
} }
}); });

6
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java
View File

@ -88,7 +88,8 @@ public class SimpleDataSourceHealthIndicator implements HealthIndicator {
} }
}); });
health.withDetail("database", product); health.withDetail("database", product);
} catch (DataAccessException ex) { }
catch (DataAccessException ex) {
health.down().withException(ex); health.down().withException(ex);
} }
String query = detectQuery(product); String query = detectQuery(product);
@ -96,7 +97,8 @@ public class SimpleDataSourceHealthIndicator implements HealthIndicator {
try { try {
health.withDetail("hello", health.withDetail("hello",
this.jdbcTemplate.queryForObject(query, Object.class)); this.jdbcTemplate.queryForObject(query, Object.class));
} catch (Exception ex) { }
catch (Exception ex) {
health.down().withException(ex); health.down().withException(ex);
} }
} }

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.actuate.health; package org.springframework.boot.actuate.health;
/** /**
* Default implementation of {@link HealthIndicator} that simply returns {@literal "ok"}. * Default implementation of {@link HealthIndicator} that simply returns {@literal "ok"}.
* *