From 2f8ae888ac4381d4d22a564e8475408789019d23 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 15 Jul 2014 13:10:16 -0600 Subject: [PATCH] use appGroupName as cluster rather than asgName --- RUNNING.md | 2 +- .../platform/netflix/turbine/EurekaInstanceDiscovery.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RUNNING.md b/RUNNING.md index f899668a..4fd65bc4 100644 --- a/RUNNING.md +++ b/RUNNING.md @@ -61,7 +61,7 @@ ## Netflix Turbine - `spring-platform-netflix-turbine$ java -jar target/spring-platform-netflix-turbine-1.0.0.BUILD-SNAPSHOT.war --InstanceDiscovery.impl=io.spring.platform.netflix.turbine.EurekaInstanceDiscovery --turbine.appConfig=samplefrontendservice --turbine.aggregator.clusterConfig=sampleApps --turbine.instanceUrlSuffix=/hystrix.stream --turbine.instanceInsertPort=true` + `spring-platform-netflix-turbine$ java -jar target/spring-platform-netflix-turbine-1.0.0.BUILD-SNAPSHOT.war --InstanceDiscovery.impl=io.spring.platform.netflix.turbine.EurekaInstanceDiscovery --turbine.appConfig=samplefrontendservice --turbine.aggregator.clusterConfig=SAMPLEAPPS --turbine.instanceUrlSuffix=/hystrix.stream --turbine.instanceInsertPort=true` ## Sandbox Sample Backend diff --git a/spring-platform-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java b/spring-platform-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java index 6eac2653..7e6e1731 100644 --- a/spring-platform-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java +++ b/spring-platform-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java @@ -162,8 +162,9 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery { * @return */ protected String getClusterName(InstanceInfo iInfo) { - return iInfo.getASGName(); - //TODO: why did this break things? return iInfo.getAppGroupName(); + //TODO: make ASG configurable return iInfo.getASGName(); + //AppGroupName is UPPERCASE from eureka + return iInfo.getAppGroupName(); } /**