From 243c13b7eeaa39023bcd55caa17a814fbf4ef9ff Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 9 Jun 2016 16:28:48 -0600 Subject: [PATCH] Make turbine.combineHostPort=true the default. fixes gh-1087 --- docs/src/main/asciidoc/spring-cloud-netflix.adoc | 2 +- .../cloud/netflix/turbine/TurbineProperties.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 89998eaa..8cae580e 100644 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -581,7 +581,7 @@ turbine: Spring Cloud provides a `spring-cloud-starter-turbine` that has all the dependencies you need to get a Turbine server running. Just create a Spring Boot application and annotate it with `@EnableTurbine`. -NOTE: by default the native Netflix behaviour built into Turbine does _not_ allow multiple processes per host, per cluster (the key to the instance id is the hostname). Spring Cloud generalizes this a bit, allowing the host and port to be used as the key, but only if you set the property `turbine.combineHostPort=true` +NOTE: by default Spring Cloud allows Turbine to use the host and port to allow multiple processes per host, per cluster. If you want the native Netflix behaviour built into Turbine that does _not_ allow multiple processes per host, per cluster (the key to the instance id is the hostname), then set the property `turbine.combineHostPort=false`. === Turbine Stream diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java index 6db68eac..86b17fe1 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineProperties.java @@ -35,7 +35,7 @@ public class TurbineProperties { private String appConfig; - private boolean combineHostPort = false; + private boolean combineHostPort = true; public List getAppConfigList() { if (!StringUtils.hasText(this.appConfig)) {