From 02846103cd5f963e958a9260340112ca18532d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 29 Oct 2018 20:40:15 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=82=20gateway=20=E9=99=8D=E7=BA=A7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8E=9F=E8=AF=B7=E6=B1=82=20=EF=BC=8Cdocker-compose?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 35 ------------------- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 4 +-- .../src/main/resources/logback-spring.xml | 2 +- .../handler/HystrixFallbackHandler.java | 9 ++++- 5 files changed, 12 insertions(+), 40 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 541bf014b..8426c5af2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,14 +5,12 @@ services: ports: - 2181:2181 restart: always - container_name: pigx-zookeeper pigx-redis: image: redis:4.0.10 ports: - 6379:6379 restart: always - container_name: pigx-redis pigx-eureka: build: @@ -21,88 +19,56 @@ services: restart: always ports: - 1025:1025 - container_name: pigx-eureka pigx-config: - links: - - pigx-eureka build: context: ./ dockerfile: ./pigx-config/Dockerfile restart: always - container_name: pigx-config pigx-gateway: - links: - - pigx-eureka - - pigx-redis build: context: ./ dockerfile: ./pigx-gateway/Dockerfile restart: always ports: - 9999:9999 - container_name: pigx-gateway pigx-auth: - links: - - pigx-eureka - - pigx-redis build: context: ./ dockerfile: ./pigx-auth/Dockerfile restart: always - container_name: pigx-auth pigx-upms: - links: - - pigx-eureka - - pigx-redis - - pigx-gateway build: context: ./ dockerfile: ./pigx-upms/pigx-upms-biz/Dockerfile restart: always - container_name: pigx-upms pigx-monitor: - links: - - pigx-eureka - - pigx-redis build: context: ./ dockerfile: ./pigx-visual/pigx-monitor/Dockerfile restart: always ports: - 5001:5001 - container_name: pigx-monitor pigx-daemon: - links: - - pigx-eureka - - pigx-redis build: context: ./ dockerfile: ./pigx-visual/pigx-daemon/Dockerfile restart: always ports: - 5002:5002 - container_name: pigx-daemon pigx-codegen: - links: - - pigx-eureka - - pigx-redis build: context: ./ dockerfile: ./pigx-visual/pigx-codegen/Dockerfile restart: always - container_name: pigx-codegen pigx-tx-manager: - links: - - pigx-eureka - - pigx-redis build: context: ./ dockerfile: ./pigx-visual/pigx-tx-manager/Dockerfile @@ -110,4 +76,3 @@ services: ports: - 5004:5004 - 9998:9998 - container_name: pigx-tx-manager diff --git a/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml b/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml index 578b8c92e..74e81d81d 100644 --- a/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml +++ b/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml @@ -21,7 +21,7 @@ ${log.path}/debug.log - ${log.path}/%d{yyyy-MM}/debug.%d{yyyy-MM-dd}.%i.log.gz + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz 50MB 30 diff --git a/pigx-config/src/main/resources/logback-spring.xml b/pigx-config/src/main/resources/logback-spring.xml index 578b8c92e..453ad895a 100644 --- a/pigx-config/src/main/resources/logback-spring.xml +++ b/pigx-config/src/main/resources/logback-spring.xml @@ -21,7 +21,7 @@ ${log.path}/debug.log - ${log.path}/%d{yyyy-MM}/debug.%d{yyyy-MM-dd}.%i.log.gz + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz 50MB 30 @@ -34,7 +34,7 @@ ${log.path}/error.log - ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + ${log.path}/%d{yyyy-MM, aux}/error.%d{yyyy-MM-dd}.%i.log.gz 50MB 30 diff --git a/pigx-eureka/src/main/resources/logback-spring.xml b/pigx-eureka/src/main/resources/logback-spring.xml index 578b8c92e..74e81d81d 100644 --- a/pigx-eureka/src/main/resources/logback-spring.xml +++ b/pigx-eureka/src/main/resources/logback-spring.xml @@ -21,7 +21,7 @@ ${log.path}/debug.log - ${log.path}/%d{yyyy-MM}/debug.%d{yyyy-MM-dd}.%i.log.gz + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz 50MB 30 diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java index ec3f15194..649cc8809 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java @@ -27,6 +27,10 @@ import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; +import java.util.Optional; + +import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR; + /** * @author lengleng * @date 2018/7/5 @@ -37,7 +41,10 @@ import reactor.core.publisher.Mono; public class HystrixFallbackHandler implements HandlerFunction { @Override public Mono handle(ServerRequest serverRequest) { - log.error("网关执行请求:{}失败,hystrix服务降级处理", serverRequest.uri()); + Optional originalUris = serverRequest.attribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR); + + originalUris.ifPresent(originalUri -> log.error("网关执行请求:{}失败,hystrix服务降级处理", originalUri)); + return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR.value()) .contentType(MediaType.TEXT_PLAIN).body(BodyInserters.fromObject("服务异常")); }