Merge pull request #15 from SpringCloud/A

A

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/eureka/EurekaInstatnceTransformer.java

@@ -27,4 +27,24 @@ public static InstanceInfo.InstanceStatus toEurekaInstanceStatus(InstanceStatus
         }
     }
 
+
+    public static InstanceStatus toGrayInstanceStatus(InstanceInfo.InstanceStatus status) {
+        if (status == null) {
+            return InstanceStatus.UNKNOWN;
+        }
+        switch (status) {
+            case DOWN:
+                return InstanceStatus.DOWN;
+            case UP:
+                return InstanceStatus.UP;
+            case STARTING:
+                return InstanceStatus.STARTING;
+            case OUT_OF_SERVICE:
+                return InstanceStatus.OUT_OF_SERVICE;
+            default:
+                return InstanceStatus.UNKNOWN;
+        }
+    }
+
+
 }

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/DBStorageConfiguration.java

@@ -2,6 +2,7 @@
 
 import cn.springcloud.gray.event.GrayEventPublisher;
 import cn.springcloud.gray.server.configuration.properties.GrayServerProperties;
+import cn.springcloud.gray.server.discovery.ServiceDiscovery;
 import cn.springcloud.gray.server.module.GrayInstanceRecordEvictor;
 import cn.springcloud.gray.server.module.GrayServerModule;
 import cn.springcloud.gray.server.module.GrayServerTrackModule;
@@ -40,11 +41,11 @@ public class DBGrayServrConfiguration {
 
         @Bean
         public GrayServerModule grayServerModule(
-                GrayEventPublisher grayEventPublisher,
+                GrayEventPublisher grayEventPublisher, @Autowired(required = false) ServiceDiscovery serviceDiscovery,
                 GrayServiceService grayServiceService, GrayInstanceService grayInstanceService,
                 GrayDecisionService grayDecisionService, GrayPolicyService grayPolicyService) {
             return new JPAGrayServerModule(
-                    grayServerProperties, grayEventPublisher, grayServiceService, grayInstanceService,
+                    grayServerProperties, grayEventPublisher, serviceDiscovery, grayServiceService, grayInstanceService,
                     grayDecisionService, grayPolicyService);
         }
 

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

@@ -5,8 +5,10 @@
 import cn.springcloud.gray.event.GrayEventPublisher;
 import cn.springcloud.gray.event.SourceType;
 import cn.springcloud.gray.model.GrayStatus;
+import cn.springcloud.gray.model.InstanceInfo;
 import cn.springcloud.gray.model.InstanceStatus;
 import cn.springcloud.gray.server.configuration.properties.GrayServerProperties;
+import cn.springcloud.gray.server.discovery.ServiceDiscovery;
 import cn.springcloud.gray.server.module.GrayServerModule;
 import cn.springcloud.gray.server.module.domain.GrayDecision;
 import cn.springcloud.gray.server.module.domain.GrayInstance;
@@ -33,14 +35,19 @@ public class JPAGrayServerModule implements GrayServerModule {
     private GrayPolicyService grayPolicyService;
     private GrayEventPublisher grayEventPublisher;
     private GrayServerProperties grayServerProperties;
+    private ServiceDiscovery serviceDiscovery;
 
     public JPAGrayServerModule(
-            GrayServerProperties grayServerProperties, GrayEventPublisher grayEventPublisher,
+            GrayServerProperties grayServerProperties,
+            GrayEventPublisher grayEventPublisher,
+            ServiceDiscovery serviceDiscovery,
             GrayServiceService grayServiceService,
             GrayInstanceService grayInstanceService,
-            GrayDecisionService grayDecisionService, GrayPolicyService grayPolicyService) {
+            GrayDecisionService grayDecisionService,
+            GrayPolicyService grayPolicyService) {
         this.grayServerProperties = grayServerProperties;
         this.grayEventPublisher = grayEventPublisher;
+        this.serviceDiscovery = serviceDiscovery;
         this.grayServiceService = grayServiceService;
         this.grayInstanceService = grayInstanceService;
         this.grayDecisionService = grayDecisionService;
@@ -89,6 +96,22 @@ public void updateGrayStatus(String instanceId, GrayStatus grayStatus) {
 
     @Override
     public void saveGrayInstance(GrayInstance instance) {
+        GrayService grayService = grayServiceService.findOneModel(instance.getServiceId());
+        if (grayService == null) {
+            grayService = GrayService.builder()
+                    .serviceId(instance.getServiceId())
+                    .serviceName(instance.getServiceId())
+                    .build();
+            grayServiceService.saveModel(grayService);
+        }
+        if (Objects.isNull(instance.getInstanceStatus()) && !Objects.isNull(serviceDiscovery)) {
+            InstanceInfo instanceInfo =
+                    serviceDiscovery.getInstanceInfo(instance.getServiceId(), instance.getInstanceId());
+            if (!Objects.isNull(instanceInfo)) {
+                instance.setInstanceStatus(instanceInfo.getInstanceStatus());
+            }
+
+        }
         grayInstanceService.saveModel(instance);
     }