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

Merge pull request #340 from kaczynskid/master

Browse Source 
Corrected example of providing Turbine cluster name via instance metadata map
This commit is contained in:
Spencer Gibb
2015-06-23 15:06:45 -04:00
parent 652e4b96b3 8fa9b71579
commit bab74edf89
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/main/asciidoc/spring-cloud-netflix.adoc
View File

@@ -477,7 +477,7 @@ turbine:
aggregator:
clusterConfig: SYSTEM,USER
appConfig: customers,stores,ui,admin
clusterNameExpression: metadata.cluster
clusterNameExpression: metadata['cluster']
----
In this case, the cluster name from 4 services is pulled from their metadata map, and is expected to have values that include "SYSTEM" and "USER".

12
spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscoveryTest.java
View File

@@ -50,4 +50,16 @@ public class EurekaInstanceDiscoveryTest {
assertEquals("clusterName is wrong", asgName, clusterName);
}
@Test
public void testGetClusterNameInstanceMetadataMapExpression() {
TurbineProperties turbineProperties = new TurbineProperties();
turbineProperties.setClusterNameExpression("metadata['cluster']");
EurekaInstanceDiscovery discovery = new EurekaInstanceDiscovery(turbineProperties);
String metadataProperty = "myCluster";
InstanceInfo instanceInfo = InstanceInfo.Builder.newBuilder()
.setAppName("testApp").add("cluster", metadataProperty).build();
String clusterName = discovery.getClusterName(instanceInfo);
assertEquals("clusterName is wrong", metadataProperty, clusterName);
}
}