优化灰度装载方式

Author: saleson

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientConfig.java

@@ -32,6 +32,4 @@ public interface GrayClientConfig {
      */
     int getInfosUpdateIntervalTimerInMs();
 
-
-    int getInfosInitializeDelayTimeInMs();
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientAutoConfiguration.java

@@ -8,6 +8,7 @@
 import cn.springcloud.gray.client.GrayClientEnrollInitializingDestroyBean;
 import cn.springcloud.gray.client.config.properties.*;
 import cn.springcloud.gray.client.initialize.DefaultGrayInfosInitializer;
+import cn.springcloud.gray.client.initialize.GrayClientApplicationRunner;
 import cn.springcloud.gray.client.initialize.GrayInfosInitializer;
 import cn.springcloud.gray.client.switcher.EnvGraySwitcher;
 import cn.springcloud.gray.client.switcher.GraySwitcher;
@@ -166,6 +167,11 @@ public GrayInfosInitializer grayInfosInitializer(
         return new DefaultGrayInfosInitializer(grayClientConfig, informationClient, refreshDriver);
     }
 
+    @Bean
+    public GrayClientApplicationRunner grayClientApplicationRunner(GrayInfosInitializer grayInfosInitializer) {
+        return new GrayClientApplicationRunner(grayInfosInitializer);
+    }
+
     @Bean
     @ConditionalOnMissingBean
     public ServerChooser serverChooser(

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayClientProperties.java

@@ -13,11 +13,6 @@ public class GrayClientProperties implements GrayClientConfig {
 
     private int infosUpdateIntervalTimerInMs = 0;
 
-    /**
-     * 实始化灰度信息的延迟时间
-     */
-    private int infosInitializeDelayTimeInMs = 40000;
-
     private InstanceConfig instance = new InstanceConfig();
 
     private Map<String, CacheProperties> caches = new HashMap<>();
@@ -43,20 +38,6 @@ public int getInfosUpdateIntervalTimerInMs() {
         return infosUpdateIntervalTimerInMs;
     }
 
-    @Override
-    public int getInfosInitializeDelayTimeInMs() {
-        return infosInitializeDelayTimeInMs;
-    }
-
-
-    public void setInfosUpdateIntervalTimerInMs(int infosUpdateIntervalTimerInMs) {
-        this.infosUpdateIntervalTimerInMs = infosUpdateIntervalTimerInMs;
-    }
-
-    public void setInfosInitializeDelayTimeInMs(int infosInitializeDelayTimeInMs) {
-        this.infosInitializeDelayTimeInMs = infosInitializeDelayTimeInMs;
-    }
-
     public Map<String, CacheProperties> getCaches() {
         return caches;
     }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/initialize/DefaultGrayInfosInitializer.java

@@ -52,13 +52,7 @@ private void scheduleOpenForWork() {
             return;
         }
         scheduleOpenForWorkCount++;
-
-        updateTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                openForWork();
-            }
-        }, getGrayClientConfig().getInfosInitializeDelayTimeInMs());
+        openForWork();
     }
 
     public void openForWork() {
@@ -69,6 +63,11 @@ public void openForWork() {
             if (timerMs > 0) {
                 updateTimer.schedule(new DefaultGrayInfosInitializer.UpdateTask(), timerMs, timerMs);
             } else if (!t) {
+                try {
+                    Thread.sleep(5000);
+                } catch (InterruptedException e) {
+
+                }
                 scheduleOpenForWork();
             }
         }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/initialize/GrayClientApplicationRunListener.java

@@ -0,0 +1,30 @@
+package cn.springcloud.gray.client.initialize;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+
+/**
+ * @author saleson
+ * @date 2020-08-16 17:02
+ */
+@Slf4j
+public class GrayClientApplicationRunner implements ApplicationRunner {
+    private GrayInfosInitializer grayInfosInitializer;
+
+    public GrayClientApplicationRunner(GrayInfosInitializer grayInfosInitializer) {
+        this.grayInfosInitializer = grayInfosInitializer;
+    }
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        log.info("开始装载灰度...");
+        try {
+            grayInfosInitializer.setup();
+        } catch (BeansException e) {
+            log.warn("灰度装载失败,cause:{}", e.getMessage());
+        }
+        log.info("灰度装载完成.");
+    }
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/initialize/GrayClientApplicationRunner.java

@@ -1,5 +1,5 @@
-org.springframework.boot.SpringApplicationRunListener=\
-  cn.springcloud.gray.client.initialize.GrayClientApplicationRunListener
+#org.springframework.boot.SpringApplicationRunListener=\
+#  cn.springcloud.gray.client.initialize.GrayClientApplicationRunListener
 # Auto Configure
 #cn.springcloud.gray.client.EnableGrayClient=\
 #  cn.springcloud.gray.client.config.GrayClientImportSelector