From cb816942a6eba2202fc8079518130490587bb13a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 8 Apr 2020 20:42:13 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/index.html | 16 ++++++---------- reference/html/spring-cloud-gateway.html | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/reference/html/index.html b/reference/html/index.html index 737f2f0a..2195d512 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -1092,11 +1092,10 @@ The accepted values are RETAIN_FIRST (default), RETAIN_LAST6.5. Spring Cloud CircuitBreaker GatewayFilter Factory

The Spring Cloud CircuitBreaker GatewayFilter factory uses the Spring Cloud CircuitBreaker APIs to wrap Gateway routes in -a circuit breaker. Spring Cloud CircuitBreaker supports two libraries that can be used with Spring Cloud Gateway, Hystrix -and Resilience4J. Since Netflix has placed Hystrix in maintenance-only mode, we suggest that you use Resilience4J.

+a circuit breaker. Spring Cloud CircuitBreaker supports multiple libraries that can be used with Spring Cloud Gateway. Spring Cloud supports Resilience4J out of the box.

-

To enable the Spring Cloud CircuitBreaker filter, you need to place either spring-cloud-starter-circuitbreaker-reactor-resilience4j or spring-cloud-starter-netflix-hystrix on the classpath. +

To enable the Spring Cloud CircuitBreaker filter, you need to place spring-cloud-starter-circuitbreaker-reactor-resilience4j on the classpath. The following example configures a Spring Cloud CircuitBreaker GatewayFilter:

@@ -1124,9 +1123,6 @@ The following example configures a Spring Cloud CircuitBreaker GatewayFilt

  • Resilience4J Documentation

    • -
  • -

    Hystrix Documentation

    -
    • @@ -1228,7 +1224,7 @@ You can find more information on doing so in the Fa

    6.6. The FallbackHeaders GatewayFilter Factory

    -

    The FallbackHeaders factory lets you add Hystrix or Spring Cloud CircuitBreaker execution exception details in the headers of a request forwarded to a fallbackUri in an external application, as in the following scenario:

    +

    The FallbackHeaders factory lets you add Spring Cloud CircuitBreaker execution exception details in the headers of a request forwarded to a fallbackUri in an external application, as in the following scenario:

    Example 24. application.yml
    @@ -1284,7 +1280,7 @@ The headers with the exception type, message and (if available) root cause excep
    -

    For more information on circuit beakers and the gatewayc see the Hystrix GatewayFilter Factory section or Spring Cloud CircuitBreaker Factory section.

    +

    For more information on circuit breakers and the gateway see the Spring Cloud CircuitBreaker Factory section.

    @@ -2619,7 +2615,7 @@ The new URI is placed in the ServerWebExchangeUtils.GATEWAY_REQUEST_URL_AT

    7.8. The Websocket Routing Filter

    -

    If the URL located in the ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR exchange attribute has a ws or wss scheme, the websocket routing rilter runs. It uses the Spring WebSocket infrastructure to forward the websocket request downstream.

    +

    If the URL located in the ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR exchange attribute has a ws or wss scheme, the websocket routing filter runs. It uses the Spring WebSocket infrastructure to forward the websocket request downstream.

    You can load-balance websockets by prefixing the URI with lb, such as lb:ws://serviceid.

    @@ -3170,7 +3166,7 @@ The following example shows what this looks like:

    spring.cloud.gateway.discovery.locator.predicates[0].args[pattern]: "'/'+serviceId+'/**'" spring.cloud.gateway.discovery.locator.predicates[1].name: Host spring.cloud.gateway.discovery.locator.predicates[1].args[pattern]: "'**.foo.com'" -spring.cloud.gateway.discovery.locator.filters[0].name: Hystrix +spring.cloud.gateway.discovery.locator.filters[0].name: CircuitBreaker spring.cloud.gateway.discovery.locator.filters[0].args[name]: serviceId spring.cloud.gateway.discovery.locator.filters[1].name: RewritePath spring.cloud.gateway.discovery.locator.filters[1].args[regexp]: "'/' + serviceId + '/(?<remaining>.*)'" diff --git a/reference/html/spring-cloud-gateway.html b/reference/html/spring-cloud-gateway.html index 737f2f0a..2195d512 100644 --- a/reference/html/spring-cloud-gateway.html +++ b/reference/html/spring-cloud-gateway.html @@ -1092,11 +1092,10 @@ The accepted values are RETAIN_FIRST (default), RETAIN_LAST6.5. Spring Cloud CircuitBreaker GatewayFilter Factory

    The Spring Cloud CircuitBreaker GatewayFilter factory uses the Spring Cloud CircuitBreaker APIs to wrap Gateway routes in -a circuit breaker. Spring Cloud CircuitBreaker supports two libraries that can be used with Spring Cloud Gateway, Hystrix -and Resilience4J. Since Netflix has placed Hystrix in maintenance-only mode, we suggest that you use Resilience4J.

    +a circuit breaker. Spring Cloud CircuitBreaker supports multiple libraries that can be used with Spring Cloud Gateway. Spring Cloud supports Resilience4J out of the box.

    -

    To enable the Spring Cloud CircuitBreaker filter, you need to place either spring-cloud-starter-circuitbreaker-reactor-resilience4j or spring-cloud-starter-netflix-hystrix on the classpath. +

    To enable the Spring Cloud CircuitBreaker filter, you need to place spring-cloud-starter-circuitbreaker-reactor-resilience4j on the classpath. The following example configures a Spring Cloud CircuitBreaker GatewayFilter:

    @@ -1124,9 +1123,6 @@ The following example configures a Spring Cloud CircuitBreaker GatewayFilt

  • Resilience4J Documentation

    • -
  • -

    Hystrix Documentation

    -
    • @@ -1228,7 +1224,7 @@ You can find more information on doing so in the Fa

    6.6. The FallbackHeaders GatewayFilter Factory

    -

    The FallbackHeaders factory lets you add Hystrix or Spring Cloud CircuitBreaker execution exception details in the headers of a request forwarded to a fallbackUri in an external application, as in the following scenario:

    +

    The FallbackHeaders factory lets you add Spring Cloud CircuitBreaker execution exception details in the headers of a request forwarded to a fallbackUri in an external application, as in the following scenario:

    Example 24. application.yml
    @@ -1284,7 +1280,7 @@ The headers with the exception type, message and (if available) root cause excep
    -

    For more information on circuit beakers and the gatewayc see the Hystrix GatewayFilter Factory section or Spring Cloud CircuitBreaker Factory section.

    +

    For more information on circuit breakers and the gateway see the Spring Cloud CircuitBreaker Factory section.

    @@ -2619,7 +2615,7 @@ The new URI is placed in the ServerWebExchangeUtils.GATEWAY_REQUEST_URL_AT

    7.8. The Websocket Routing Filter

    -

    If the URL located in the ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR exchange attribute has a ws or wss scheme, the websocket routing rilter runs. It uses the Spring WebSocket infrastructure to forward the websocket request downstream.

    +

    If the URL located in the ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR exchange attribute has a ws or wss scheme, the websocket routing filter runs. It uses the Spring WebSocket infrastructure to forward the websocket request downstream.

    You can load-balance websockets by prefixing the URI with lb, such as lb:ws://serviceid.

    @@ -3170,7 +3166,7 @@ The following example shows what this looks like:

    spring.cloud.gateway.discovery.locator.predicates[0].args[pattern]: "'/'+serviceId+'/**'" spring.cloud.gateway.discovery.locator.predicates[1].name: Host spring.cloud.gateway.discovery.locator.predicates[1].args[pattern]: "'**.foo.com'" -spring.cloud.gateway.discovery.locator.filters[0].name: Hystrix +spring.cloud.gateway.discovery.locator.filters[0].name: CircuitBreaker spring.cloud.gateway.discovery.locator.filters[0].args[name]: serviceId spring.cloud.gateway.discovery.locator.filters[1].name: RewritePath spring.cloud.gateway.discovery.locator.filters[1].args[regexp]: "'/' + serviceId + '/(?<remaining>.*)'"