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

make use of 'metadataMap.instanceId' consistent

Browse Source
This commit is contained in:
Spencer Gibb
2015-09-10 12:18:31 -06:00
parent bea48c5150
commit d72c9f0dc4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerList.java
View File

@@ -105,7 +105,7 @@ class DomainExtractingServer extends DiscoveryEnabledServer {
DiscoveryEnabledServer enabled = (DiscoveryEnabledServer) server;
InstanceInfo instance = enabled.getInstanceInfo();
if (instance.getMetadata().containsKey("instanceId")) {
return instance.getMetadata().get("instanceId");
return instance.getHostName()+":"+instance.getMetadata().get("instanceId");
}
}
return super.getId();

2
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java
View File

@@ -98,7 +98,7 @@ public class DomainExtractingServerListTests {
actualServer instanceof DomainExtractingServer);
DomainExtractingServer des = DomainExtractingServer.class.cast(actualServer);
assertEquals("zone was wrong", zone, des.getZone());
assertEquals("instanceId was wrong", INSTANCE_ID, des.getId());
assertEquals("instanceId was wrong", HOST_NAME + ":" + INSTANCE_ID, des.getId());
return des;
}