优化代码

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java

@@ -5,26 +5,19 @@
 import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
 import cn.springcloud.gray.client.netflix.hystrix.HystrixRequestLocalStorage;
 import cn.springcloud.gray.request.RequestLocalStorage;
-import cn.springcloud.gray.request.track.GrayTrackHolder;
-import cn.springcloud.gray.web.GrayTrackFilter;
 import com.netflix.hystrix.HystrixCommand;
-import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
 import feign.hystrix.HystrixFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.io.IOException;
+import org.springframework.context.annotation.Import;
 
 @Configuration
 @ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
+@Import(HystrixGrayTrackWebConfiguration.class)
 public class HystrixGrayAutoConfiguration {
 
 
@@ -40,28 +33,6 @@ public RequestLocalStorage requestLocalStorage() {
     }
 
 
-    @Bean
-    public GrayTrackFilter grayTrackFilter(
-            GrayTrackHolder grayTrackHolder,
-            RequestLocalStorage requestLocalStorage) {
-        return new GrayTrackFilter(grayTrackHolder, requestLocalStorage) {
-            @Override
-            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-                if (!HystrixRequestContext.isCurrentThreadInitialized()) {
-                    HystrixRequestContext.initializeContext();
-                }
-                try {
-                    super.doFilter(request, response, chain);
-                } finally {
-                    if (HystrixRequestContext.isCurrentThreadInitialized()) {
-                        HystrixRequestContext.getContextForCurrentThread().shutdown();
-                    }
-                }
-            }
-        };
-    }
-
-
     /**
      * 支持hystrix使用线程隔离时依然能够进行跑线程传递GrayRequest
      *

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayTrackWebConfiguration.java

@@ -0,0 +1,39 @@
+package cn.springcloud.gray.client.netflix.configuration;
+
+import cn.springcloud.gray.request.RequestLocalStorage;
+import cn.springcloud.gray.request.track.GrayTrackHolder;
+import cn.springcloud.gray.web.GrayTrackFilter;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
+
+@Configuration
+public class HystrixGrayTrackWebConfiguration {
+
+    @Bean
+    public GrayTrackFilter grayTrackFilter(
+            GrayTrackHolder grayTrackHolder,
+            RequestLocalStorage requestLocalStorage) {
+        return new GrayTrackFilter(grayTrackHolder, requestLocalStorage) {
+            @Override
+            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+                if (!HystrixRequestContext.isCurrentThreadInitialized()) {
+                    HystrixRequestContext.initializeContext();
+                }
+                try {
+                    super.doFilter(request, response, chain);
+                } finally {
+                    if (HystrixRequestContext.isCurrentThreadInitialized()) {
+                        HystrixRequestContext.getContextForCurrentThread().shutdown();
+                    }
+                }
+            }
+        };
+    }
+}

spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/main/resources/config/application.yml

@@ -35,7 +35,7 @@ spring:
         #            max-attempts: 1
         GrayEventOutput:
           destination: gray_event
-            #      rabbit:
+          #      rabbit:
           #        bindings:
           #          GrayEventInput:
           #            consumer:
@@ -54,4 +54,4 @@ eureka:
 
 gray:
   server:
-    evictionIntervalTimerInMs: 60000
+    evictionIntervalTimerInMs: 30000

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml

@@ -36,8 +36,8 @@ eureka:
       defaultZone: http://localhost:20001/eureka/
   instance:
     instanceId: ${spring.application.name}:${server.port}
-    lease-renewal-interval-in-seconds: 10
-    lease-expiration-duration-in-seconds: 30
+    lease-renewal-interval-in-seconds: 5
+    lease-expiration-duration-in-seconds: 15
 #    initial-status: starting
 feign:
   hystrix:

spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/resources/config/application.yml

@@ -32,8 +32,8 @@ eureka:
     serviceUrl:
       defaultZone: http://localhost:20001/eureka/
   instance:
-    lease-renewal-interval-in-seconds: 10
-    lease-expiration-duration-in-seconds: 30
+    lease-renewal-interval-in-seconds: 5
+    lease-expiration-duration-in-seconds: 15
 #    initial-status: starting
 
 ribbon:

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/GrayServerModule.java

@@ -44,6 +44,8 @@ default void openGray(String instanceId) {
 
     void updateInstanceStatus(String instanceId, InstanceStatus instanceStatus);
 
+    void updateInstanceStatus(GrayInstance instance, InstanceStatus instanceStatus);
+
     void deleteGrayInstance(String intanceId);
 
     void saveGrayPolicy(GrayPolicy grayPolicy);

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/SimpleGrayServerModule.java

@@ -94,6 +94,11 @@ public void saveGrayInstance(GrayInstance instance) {
     @Override
     public void updateInstanceStatus(String instanceId, InstanceStatus instanceStatus) {
         GrayInstance instance = grayInstanceService.findOneModel(instanceId);
+        updateInstanceStatus(instance, instanceStatus);
+    }
+
+    @Override
+    public void updateInstanceStatus(GrayInstance instance, InstanceStatus instanceStatus) {
         if (instance != null && !Objects.equals(instance.getInstanceStatus(), instanceStatus)) {
             instance.setInstanceStatus(instanceStatus);
             grayInstanceService.saveModel(instance);

spring-cloud-starter-gray-eureka-server/src/main/java/cn/springcloud/gray/eureka/server/listener/EurekaInstanceListener.java

@@ -34,7 +34,8 @@ public void listenDown(EurekaInstanceCanceledEvent event) {
         InstanceRegistry registry = (InstanceRegistry) event.getSource();
         com.netflix.appinfo.InstanceInfo instanceInfo =
                 registry.getApplication(event.getAppName()).getByInstanceId(event.getServerId());
-        sendNotice(instanceInfo, InstanceStatus.DOWN, "DOWN");
+        InstanceStatus instanceStatus = EurekaInstatnceTransformer.toGrayInstanceStatus(instanceInfo.getStatus());
+        sendNotice(instanceInfo, instanceStatus, "DOWN");
     }
 
 
@@ -46,7 +47,8 @@ public void listenDown(EurekaInstanceCanceledEvent event) {
     @EventListener
     public void listenRenew(EurekaInstanceRenewedEvent event) {
         com.netflix.appinfo.InstanceInfo instanceInfo = event.getInstanceInfo();
-        sendNotice(instanceInfo, InstanceStatus.UP, "REGISTERED");
+        InstanceStatus instanceStatus = EurekaInstatnceTransformer.toGrayInstanceStatus(instanceInfo.getStatus());
+        sendNotice(instanceInfo, instanceStatus, "RENEW");
     }