SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inject Environment into health indicator

Browse Source 
Fixes gh-457, fixes gh-456
This commit is contained in:
Marcos Barbero
2016-07-27 19:07:24 -03:00
committed by Dave Syer
parent 3caa7cda0d
commit 8feec99600
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java
View File

@@ -34,6 +34,7 @@ import org.springframework.core.env.Environment;
* the config server, if there is one.
*
* @author Dave Syer
* @author Marcos Barbero
*
*/
@Configuration
@@ -60,8 +61,8 @@ public class ConfigClientAutoConfiguration {
@Bean
public ConfigServerHealthIndicator configServerHealthIndicator(
ConfigServicePropertySourceLocator locator) {
return new ConfigServerHealthIndicator(locator);
ConfigServicePropertySourceLocator locator, Environment environment) {
return new ConfigServerHealthIndicator(locator, environment);
}
}

22
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java
View File

@@ -5,32 +5,28 @@ import java.util.List;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.core.env.AbstractEnvironment;
import org.springframework.core.env.CompositePropertySource;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertySource;
/**
* @author Spencer Gibb
* @author Marcos Barbero
*/
public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
private ConfigServicePropertySourceLocator locator;
private Environment env;
private ConfigServicePropertySourceLocator locator;
private Environment environment;
public ConfigServerHealthIndicator(ConfigServicePropertySourceLocator locator) {
this.env = new AbstractEnvironment() {
@Override
public String[] getActiveProfiles() {
return new String[] {"default"};
}
};
this.locator = locator;
}
public ConfigServerHealthIndicator(ConfigServicePropertySourceLocator locator,
Environment environment) {
this.environment = environment;
this.locator = locator;
}
@Override
protected void doHealthCheck(Builder builder) throws Exception {
PropertySource<?> propertySource = locator.locate(this.env);
PropertySource<?> propertySource = locator.locate(this.environment);
builder.up();
if (propertySource instanceof CompositePropertySource) {
List<String> sources = new ArrayList<>();

4
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerHealthIndicatorTests.java
View File

@@ -29,14 +29,16 @@ import org.springframework.core.env.PropertySource;
/**
* @author Dave Syer
* @author Marcos Barbero
*
*/
public class ConfigServerHealthIndicatorTests {
private ConfigServicePropertySourceLocator locator = Mockito
.mock(ConfigServicePropertySourceLocator.class);
private Environment environment = Mockito.mock(Environment.class);
private ConfigServerHealthIndicator indicator = new ConfigServerHealthIndicator(
locator);
locator, environment);
@Test
public void testDefaultStatus() {