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

Align instanceId calculation with the one done on the client

Browse Source 
The Angel client has an idiosyncratic way of calculating an instance
id, and the Brixton client aligned with that already, but the
Brixton server did not. This change should make Brixton Eureka
Servers work with Angel clients.

See gh-978
This commit is contained in:
Dave Syer
2016-05-18 17:32:26 +02:00
parent d5252375e1
commit a0c1b4c05d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/CloudJacksonJson.java
View File

@@ -123,12 +123,21 @@ public class CloudJacksonJson extends LegacyJacksonJson {
SerializerProvider provider) throws IOException {
if (info.getInstanceId() == null && info.getMetadata() != null) {
String instanceId = info.getMetadata().get("instanceId");
String instanceId = calculateInstanceId(info);
info = new InstanceInfo.Builder(info).setInstanceId(instanceId).build();
}
super.serialize(info, jgen, provider);
}
private String calculateInstanceId(InstanceInfo info) {
String instanceId = info.getMetadata().get("instanceId");
String hostName = info.getHostName();
if (instanceId != null && !instanceId.startsWith(hostName)) {
instanceId = hostName + ":" + instanceId;
}
return instanceId == null ? hostName : instanceId;
}
}
static class CloudInstanceInfoDeserializer extends InstanceInfoDeserializer {