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

Cache instanceId

Browse Source 
Rather than recompute from ConsulDiscoveryProperties. Specifically instanceId shouldn't change.

fixes gh-227
This commit is contained in:
Spencer Gibb
2016-09-22 10:37:58 -06:00
parent 2ce05626c1
commit 9a66c450ff
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java
View File

@@ -54,6 +54,8 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
private NewService service = new NewService();
private String instanceId;
public ConsulLifecycle(ConsulClient client, ConsulDiscoveryProperties properties, HeartbeatProperties ttlConfig) {
this.client = client;
this.properties = properties;
@@ -129,11 +131,16 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
}
public String getServiceId() {
if (!StringUtils.hasText(properties.getInstanceId())) {
return normalizeForDns(getContext().getId());
} else {
return normalizeForDns(properties.getInstanceId());
// cache instanceId, so on refresh this won't get recomputed
// this is a problem if ${random.value} is used
if (this.instanceId == null) {
if (!StringUtils.hasText(properties.getInstanceId())) {
this.instanceId = normalizeForDns(getContext().getId());
} else {
this.instanceId = normalizeForDns(properties.getInstanceId());
}
}
return this.instanceId;
}
@Override

20
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedTests.java
View File

@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNotNull;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ConsulLifecycleCustomizedTests.MyTestConfig.class)
@WebIntegrationTest(value = { "spring.application.name=testCustomLifecycle" }, randomPort = true)
@WebIntegrationTest(value = { "spring.application.name=testCustomLifecycle", "spring.cloud.consul.discovery.instanceId=foo" }, randomPort = true)
public class ConsulLifecycleCustomizedTests {
@Autowired
@@ -50,6 +50,8 @@ public class ConsulLifecycleCustomizedTests {
private ConsulLifecycle lifecycle1;
@Autowired
private CustomConsulLifecycle lifecycle2;
@Autowired
private ConsulDiscoveryProperties properties;
@Test
public void getInstancesForServiceWorks() {
@@ -60,8 +62,15 @@ public class ConsulLifecycleCustomizedTests {
@Test
public void usesCustomConsulLifecycle() {
assertEquals("serviceId is not customized", "foo", lifecycle1.getServiceId());
assertEquals("serviceId is not customized", "foo", lifecycle2.getServiceId());
assertEquals("serviceId is not customized", "foo:bar", lifecycle1.getServiceId());
assertEquals("serviceId is not customized", "foo:bar", lifecycle2.getServiceId());
}
@Test
public void serviceIdIsCached() {
// simulate a refresh where instanceId is changed
this.properties.setInstanceId("baz");
assertEquals("serviceId is not cached", "foo:bar", lifecycle2.getServiceId());
}
@Configuration
@@ -76,15 +85,18 @@ public class ConsulLifecycleCustomizedTests {
}
public static class CustomConsulLifecycle extends ConsulLifecycle {
private ConsulDiscoveryProperties properties;
@Autowired
public CustomConsulLifecycle(ConsulClient client,
ConsulDiscoveryProperties properties, HeartbeatProperties ttlConfig) {
super(client, properties, ttlConfig);
this.properties = properties;
}
@Override
public String getServiceId() {
return "foo";
return super.getServiceId()+":bar";
}
}
}