From fdda3725101269117eb07bf3716c5ed61c6d6e16 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 19 Dec 2019 16:28:38 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/appendix.html | 5 +++++ reference/html/index.html | 23 +++++++++++++++++------ reference/html/spring-cloud-commons.html | 23 +++++++++++++++++------ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/reference/html/appendix.html b/reference/html/appendix.html index 74d40261..5a078d55 100644 --- a/reference/html/appendix.html +++ b/reference/html/appendix.html @@ -285,6 +285,11 @@ Also, you can define your own properties.

Causes RibbonLoadBalancerClient to be used by default.

+

spring.cloud.loadbalancer.zone

+ + + +

spring.cloud.refresh.enabled

true

Enables autoconfiguration for the refresh scope and associated features.

diff --git a/reference/html/index.html b/reference/html/index.html index 26274f79..3edcff94 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -1515,6 +1515,18 @@ You can also override DiscoveryClient-specific zone setup by settin +
+ + + + + +
+ + +For the time being, only Eureka Discovery Client is instrumented to set the LoadBalancer zone. For other discovery client, set the spring.cloud.loadbalancer.zone property. More instrumentations coming shortly. +
+
@@ -1548,11 +1560,12 @@ We suggest passing a DiscoveryClientServiceInstanceListSupplier del @Bean public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( ReactiveDiscoveryClient discoveryClient, Environment environment, + LoadBalancerProperties loadBalancerProperties, ApplicationContext context) { DiscoveryClientServiceInstanceListSupplier firstDelegate = new DiscoveryClientServiceInstanceListSupplier( discoveryClient, environment); ZonePreferenceServiceInstanceListSupplier delegate = new ZonePreferenceServiceInstanceListSupplier(firstDelegate, - environment); + loadBalancerProperties); ObjectProvider<LoadBalancerCacheManager> cacheManagerProvider = context .getBeanProvider(LoadBalancerCacheManager.class); if (cacheManagerProvider.getIfAvailable() != null) { @@ -1561,8 +1574,7 @@ We suggest passing a DiscoveryClientServiceInstanceListSupplier del } return delegate; } - -} + } @@ -1624,11 +1636,10 @@ public class MyConfiguration {
-

You can use this feature to instantiate different implementations of ServiceInstanceListSupplier or ReactorLoadBalancer, -either written by you, or provided by us as alternatives (for example ZonePreferenceServiceInstanceListSupplier) to override the default setup.

+

You can use this feature to instantiate different implementations of ServiceInstanceListSupplier or ReactorLoadBalancer, either written by you, or provided by us as alternatives (for example ZonePreferenceServiceInstanceListSupplier) to override the default setup.

-

You can see an example of a custom cofiguration here.

+

You can see an example of a custom configuration here.

diff --git a/reference/html/spring-cloud-commons.html b/reference/html/spring-cloud-commons.html index 26274f79..3edcff94 100644 --- a/reference/html/spring-cloud-commons.html +++ b/reference/html/spring-cloud-commons.html @@ -1515,6 +1515,18 @@ You can also override DiscoveryClient-specific zone setup by settin
+
+ + + + + +
+ + +For the time being, only Eureka Discovery Client is instrumented to set the LoadBalancer zone. For other discovery client, set the spring.cloud.loadbalancer.zone property. More instrumentations coming shortly. +
+
@@ -1548,11 +1560,12 @@ We suggest passing a DiscoveryClientServiceInstanceListSupplier del @Bean public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( ReactiveDiscoveryClient discoveryClient, Environment environment, + LoadBalancerProperties loadBalancerProperties, ApplicationContext context) { DiscoveryClientServiceInstanceListSupplier firstDelegate = new DiscoveryClientServiceInstanceListSupplier( discoveryClient, environment); ZonePreferenceServiceInstanceListSupplier delegate = new ZonePreferenceServiceInstanceListSupplier(firstDelegate, - environment); + loadBalancerProperties); ObjectProvider<LoadBalancerCacheManager> cacheManagerProvider = context .getBeanProvider(LoadBalancerCacheManager.class); if (cacheManagerProvider.getIfAvailable() != null) { @@ -1561,8 +1574,7 @@ We suggest passing a DiscoveryClientServiceInstanceListSupplier del } return delegate; } - -} + } @@ -1624,11 +1636,10 @@ public class MyConfiguration {
-

You can use this feature to instantiate different implementations of ServiceInstanceListSupplier or ReactorLoadBalancer, -either written by you, or provided by us as alternatives (for example ZonePreferenceServiceInstanceListSupplier) to override the default setup.

+

You can use this feature to instantiate different implementations of ServiceInstanceListSupplier or ReactorLoadBalancer, either written by you, or provided by us as alternatives (for example ZonePreferenceServiceInstanceListSupplier) to override the default setup.

-

You can see an example of a custom cofiguration here.

+

You can see an example of a custom configuration here.