From 328ab89935f7b1396dab3f6969865afc13c98b8d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 4 Jun 2018 18:18:52 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- ...spring_cloud_commons_common_abstractions.html | 6 ++++-- single/spring-cloud-commons.html | 6 ++++-- spring-cloud-commons.xml | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/multi/multi__spring_cloud_commons_common_abstractions.html b/multi/multi__spring_cloud_commons_common_abstractions.html index f15fe674..ff0feab1 100644 --- a/multi/multi__spring_cloud_commons_common_abstractions.html +++ b/multi/multi__spring_cloud_commons_common_abstractions.html @@ -25,7 +25,9 @@ Otherwise, it can bubble up as the description of t Registration registration = constructRegistration(); this.registry.register(registration); } -}

Each ServiceRegistry implementation has its own Registry implementation.

2.2.1 ServiceRegistry Auto-Registration

By default, the ServiceRegistry implementation auto-registers the running service. +}

Each ServiceRegistry implementation has its own Registry implementation.

  • ZookeeperRegistration used with ZookeeperServiceRegistry
  • EurekaRegistration used with EurekaServiceRegistry
  • ConsulRegistration used with ConsulServiceRegistry

If you are using the ServiceRegistry interface, you are going to need to pass the +correct Registry implementation for the ServiceRegistry implementation you +are using.

2.2.1 ServiceRegistry Auto-Registration

By default, the ServiceRegistry implementation auto-registers the running service. To disable that behavior, you can set: * @EnableDiscoveryClient(autoRegister=false) to permanently disable auto-registration. * spring.cloud.service-registry.auto-registration.enabled=false to disable the behavior through configuration.

2.2.2 Service Registry Actuator Endpoint

Spring Cloud Commons provides a /service-registry actuator endpoint. @@ -177,7 +179,7 @@ The following configuration ignores the docker0 int ignoredInterfaces: - docker0 - veth.*

-

You can also force the use of only specified network addresses by using a list of regular expressions, as shown in the following example:

application.yml.  +

You can also force the use of only specified network addresses by using a list of regular expressions, as shown in the following example:

bootstrap.yml.  

spring:
   cloud:
     inetutils:
diff --git a/single/spring-cloud-commons.html b/single/spring-cloud-commons.html
index 7cf12dee..64e00463 100644
--- a/single/spring-cloud-commons.html
+++ b/single/spring-cloud-commons.html
@@ -112,7 +112,9 @@ Otherwise, it can bubble up as the description of t
         Registration registration = constructRegistration();
         this.registry.register(registration);
     }
-}

Each ServiceRegistry implementation has its own Registry implementation.

2.2.1 ServiceRegistry Auto-Registration

By default, the ServiceRegistry implementation auto-registers the running service. +}

Each ServiceRegistry implementation has its own Registry implementation.

  • ZookeeperRegistration used with ZookeeperServiceRegistry
  • EurekaRegistration used with EurekaServiceRegistry
  • ConsulRegistration used with ConsulServiceRegistry

If you are using the ServiceRegistry interface, you are going to need to pass the +correct Registry implementation for the ServiceRegistry implementation you +are using.

2.2.1 ServiceRegistry Auto-Registration

By default, the ServiceRegistry implementation auto-registers the running service. To disable that behavior, you can set: * @EnableDiscoveryClient(autoRegister=false) to permanently disable auto-registration. * spring.cloud.service-registry.auto-registration.enabled=false to disable the behavior through configuration.

2.2.2 Service Registry Actuator Endpoint

Spring Cloud Commons provides a /service-registry actuator endpoint. @@ -264,7 +266,7 @@ The following configuration ignores the docker0 int ignoredInterfaces: - docker0 - veth.*

-

You can also force the use of only specified network addresses by using a list of regular expressions, as shown in the following example:

application.yml.  +

You can also force the use of only specified network addresses by using a list of regular expressions, as shown in the following example:

bootstrap.yml.  

spring:
   cloud:
     inetutils:
diff --git a/spring-cloud-commons.xml b/spring-cloud-commons.xml
index c5d5fe8d..1a2366ef 100644
--- a/spring-cloud-commons.xml
+++ b/spring-cloud-commons.xml
@@ -283,6 +283,20 @@ public class MyConfiguration {
     }
 }
 Each ServiceRegistry implementation has its own Registry implementation.
+
+
+ZookeeperRegistration used with ZookeeperServiceRegistry
+
+
+EurekaRegistration used with EurekaServiceRegistry
+
+
+ConsulRegistration used with ConsulServiceRegistry
+
+
+If you are using the ServiceRegistry interface, you are going to need to pass the
+correct Registry implementation for the ServiceRegistry implementation you
+are using.
 

 ServiceRegistry Auto-Registration
 By default, the ServiceRegistry implementation auto-registers the running service.
@@ -496,7 +510,7 @@ The following configuration ignores the docker0 interface and
 
 You can also force the use of only specified network addresses by using a list of regular expressions, as shown in the following example:
 
-application.yml
+bootstrap.yml
 
 spring:
   cloud: