Commit de9af2b4 by Spencer Gibb

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

fixes gh-53
parent 0f573dfe
...@@ -60,9 +60,6 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered { ...@@ -60,9 +60,6 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
private int port = 0; private int port = 0;
@Autowired @Autowired
private EurekaClientConfigBean clientConfig;
@Autowired
private EurekaInstanceConfigBean instanceConfig; private EurekaInstanceConfigBean instanceConfig;
@PreDestroy @PreDestroy
...@@ -83,7 +80,7 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered { ...@@ -83,7 +80,7 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
discoveryManagerIntitializer().init(); discoveryManagerIntitializer().init();
logger.info("Registering application {} with eureka with status UP", logger.info("Registering application {} with eureka with status UP",
instanceConfig.getAppname()); instanceConfig.getAppname());
ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.UP); ApplicationInfoManager.getInstance().setInstanceStatus(instanceConfig.getInitialStatus());
running = true; running = true;
} }
} }
......
...@@ -32,6 +32,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; ...@@ -32,6 +32,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import com.netflix.appinfo.DataCenterInfo; import com.netflix.appinfo.DataCenterInfo;
import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.appinfo.InstanceInfo.InstanceStatus;
/** /**
* @author Dave Syer * @author Dave Syer
...@@ -102,6 +103,8 @@ public class EurekaInstanceConfigBean implements EurekaInstanceConfig { ...@@ -102,6 +103,8 @@ public class EurekaInstanceConfigBean implements EurekaInstanceConfig {
private boolean preferIpAddress = false; private boolean preferIpAddress = false;
private InstanceStatus initialStatus = InstanceStatus.UP;
public String getHostname() { public String getHostname() {
return preferIpAddress ? ipAddress : hostname; return preferIpAddress ? ipAddress : hostname;
} }
......
...@@ -17,13 +17,16 @@ package org.springframework.cloud.netflix.eureka; ...@@ -17,13 +17,16 @@ package org.springframework.cloud.netflix.eureka;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.netflix.appinfo.InstanceInfo.InstanceStatus;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.springframework.boot.test.EnvironmentTestUtils.*;
/** /**
* @author Dave Syer * @author Dave Syer
...@@ -42,13 +45,9 @@ public class EurekaInstanceConfigBeanTests { ...@@ -42,13 +45,9 @@ public class EurekaInstanceConfigBeanTests {
@Test @Test
public void basicBinding() { public void basicBinding() {
EnvironmentTestUtils.addEnvironment(context, addEnvironment(context, "eureka.instance.appGroupName=mygroup");
"eureka.instance.appGroupName=mygroup"); setupContext();
context.register(PropertyPlaceholderAutoConfiguration.class, assertEquals("mygroup", getInstanceConfig().getAppGroupName());
TestConfiguration.class);
context.refresh();
assertEquals("mygroup", context.getBean(EurekaInstanceConfigBean.class)
.getAppGroupName());
} }
@Test @Test
...@@ -72,12 +71,40 @@ public class EurekaInstanceConfigBeanTests { ...@@ -72,12 +71,40 @@ public class EurekaInstanceConfigBeanTests {
} }
private void testNonSecurePort(String propName) { 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, context.register(PropertyPlaceholderAutoConfiguration.class,
TestConfiguration.class); TestConfiguration.class);
context.refresh(); context.refresh();
assertEquals(8888, }
context.getBean(EurekaInstanceConfigBean.class).getNonSecurePort());
protected EurekaInstanceConfigBean getInstanceConfig() {
return context.getBean(EurekaInstanceConfigBean.class);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment