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

Added eureka.instance.initial-status to customize the starting status.

Browse Source 
fixes gh-53
This commit is contained in:
Spencer Gibb
2014-11-05 18:42:20 -07:00
parent 0f573dfe94
commit de9af2b4df
3 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
View File

@@ -59,9 +59,6 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
private int port = 0;
@Autowired
private EurekaClientConfigBean clientConfig;
@Autowired
private EurekaInstanceConfigBean instanceConfig;
@@ -83,7 +80,7 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
discoveryManagerIntitializer().init();
logger.info("Registering application {} with eureka with status UP",
instanceConfig.getAppname());
ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.UP);
ApplicationInfoManager.getInstance().setInstanceStatus(instanceConfig.getInitialStatus());
running = true;
}
}

3
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java
View File

@@ -32,6 +32,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import com.netflix.appinfo.DataCenterInfo;
import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.appinfo.InstanceInfo.InstanceStatus;
/**
* @author Dave Syer
@@ -101,6 +102,8 @@ public class EurekaInstanceConfigBean implements EurekaInstanceConfig {
private String hostname = hostInfo[1];
private boolean preferIpAddress = false;
private InstanceStatus initialStatus = InstanceStatus.UP;
public String getHostname() {
return preferIpAddress ? ipAddress : hostname;

49
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
View File

@@ -17,13 +17,16 @@ package org.springframework.cloud.netflix.eureka;
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Configuration;
import com.netflix.appinfo.InstanceInfo.InstanceStatus;
import static org.junit.Assert.assertEquals;
import static org.springframework.boot.test.EnvironmentTestUtils.*;
/**
* @author Dave Syer
@@ -42,13 +45,9 @@ public class EurekaInstanceConfigBeanTests {
@Test
public void basicBinding() {
EnvironmentTestUtils.addEnvironment(context,
"eureka.instance.appGroupName=mygroup");
context.register(PropertyPlaceholderAutoConfiguration.class,
TestConfiguration.class);
context.refresh();
assertEquals("mygroup", context.getBean(EurekaInstanceConfigBean.class)
.getAppGroupName());
addEnvironment(context, "eureka.instance.appGroupName=mygroup");
setupContext();
assertEquals("mygroup", getInstanceConfig().getAppGroupName());
}
@Test
@@ -72,12 +71,40 @@ public class EurekaInstanceConfigBeanTests {
}
private void testNonSecurePort(String propName) {
EnvironmentTestUtils.addEnvironment(context, propName +":8888");
addEnvironment(context, propName + ":8888");
setupContext();
assertEquals(8888, getInstanceConfig().getNonSecurePort());
}
@Test
public void testDefaultInitialStatus() {
setupContext();
assertEquals("initialStatus wrong", InstanceStatus.UP,
getInstanceConfig().getInitialStatus());
}
@Test(expected = BeanCreationException.class)
public void testBadInitialStatus() {
addEnvironment(context, "eureka.instance.initial-status:FOO");
setupContext();
}
@Test
public void testCustomInitialStatus() {
addEnvironment(context, "eureka.instance.initial-status:STARTING");
setupContext();
assertEquals("initialStatus wrong", InstanceStatus.STARTING,
getInstanceConfig().getInitialStatus());
}
private void setupContext() {
context.register(PropertyPlaceholderAutoConfiguration.class,
TestConfiguration.class);
context.refresh();
assertEquals(8888,
context.getBean(EurekaInstanceConfigBean.class).getNonSecurePort());
}
protected EurekaInstanceConfigBean getInstanceConfig() {
return context.getBean(EurekaInstanceConfigBean.class);
}
/*