添加debug日志

Author: saleson

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

@@ -57,7 +57,7 @@ public Object chooseServer(List<Object> servers, ListChooser<Object> chooser) {
         List<Object> serverList = serverListProcessor.process(serviceId, servers);
 
         if (!grayManager.hasServiceGray(serviceId)) {
-            log.debug("{} 服务没有相关灰度策略, 从serverList列表挑选, serverList.size={}", serviceId, serverList.size());
+            log.debug("{} 服务没有相关灰度策略, 从serverList列表进行灰度策选, serverList.size={}", serviceId, serverList.size());
             return chooseInstanceServer(serverList, chooser);
         }
 
@@ -67,7 +67,7 @@ public Object chooseServer(List<Object> servers, ListChooser<Object> chooser) {
                 serviceGrayServerSorter.distinguishAndMatchGrayServerSpecList(serverSpecs);
 
         if (Objects.isNull(serviceServerSpecListResult)) {
-            log.debug("区分 {} 服务灰度列表和正常列表失败, 从serverList列表挑选, serverList.size={}", serviceId, serverList.size());
+            log.debug("区分 {} 服务灰度列表和正常列表失败, 从serverList列表进行灰度策选, serverList.size={}", serviceId, serverList.size());
             return chooseInstanceServer(serverList, chooser);
         }
 

spring-cloud-gray-event/src/main/java/cn/springlcoud/gray/event/EmptyGrayEvent.java

@@ -0,0 +1,14 @@
+package cn.springlcoud.gray.event;
+
+/**
+ * @author saleson
+ * @date 2020-09-01 00:01
+ */
+public class EmptyGrayEvent extends GrayEvent {
+    private static final long serialVersionUID = -6870842690230609456L;
+
+    @Override
+    public String getSourceId() {
+        return "";
+    }
+}

spring-cloud-gray-event/src/main/java/cn/springlcoud/gray/event/client/AbstractGrayEventPublisher.java

@@ -4,6 +4,7 @@
 import cn.springcloud.gray.error.handler.LoggingErrorHandler;
 import cn.springcloud.gray.retriever.GenericRetriever;
 import cn.springlcoud.gray.event.GrayEvent;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.Collection;
 import java.util.List;
@@ -12,6 +13,7 @@
  * @author saleson
  * @date 2020-01-30 13:25
  */
+@Slf4j
 public abstract class AbstractGrayEventPublisher implements GrayEventPublisher {
 
     //    private final Map<ListenerCacheKey, ListenerRetriever> retrieverCache = new ConcurrentHashMap<>(64);
@@ -29,6 +31,7 @@ public AbstractGrayEventPublisher(List<GrayEventListener> grayEventListeners) {
     public void publishEvent(GrayEvent grayEvent) {
 //        Collection<GrayEventListener<?>> grayEventListeners = getGrayEventListeners(grayEvent);
         Collection<GrayEventListener<?>> grayEventListeners = genericRetriever.retrieveFunctions(grayEvent);
+        log.debug("接收到{}:{}, GrayEventListeners size:{}", grayEvent.getClass(), grayEvent, grayEventListeners.size());
         grayEventListeners.forEach(listener -> invokeListenOnEvent(listener, grayEvent));
     }
 

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/event/triggering/GrayEventLogRetriever.java

@@ -9,7 +9,6 @@
 import cn.springlcoud.gray.event.server.GrayEventRetriever;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,15 +91,22 @@ private GrayEvent toGrayEvent(GrayEventLog grayEventLog) {
 //                    (Class<? extends GrayEvent>) Class.forName(grayEventLog.getEventClass());
             Class<? extends GrayEvent> eventClass = retrieveTypeClass(grayEventLog.getType());
             grayEvent = grayEventDecoder.decode(grayEventLog.getContent(), eventClass);
-        } catch (IOException e) {
-            //todo print error log
-            log.error("");
-            throw new RuntimeException(e);
+        } catch (Exception e) {
+            log.error("GrayEventLog 转换 GrayEvent 失败, 发生异常 {}:{}, Log:{} , 返加",
+                    e.getClass(), e.getMessage(), grayEventLog, e);
+            return createEmptyGrayEvent(grayEventLog);
         }
         return decorateEvent(grayEvent);
     }
 
 
+    private EmptyGrayEvent createEmptyGrayEvent(GrayEventLog grayEventLog) {
+        EmptyGrayEvent emptyGrayEvent = new EmptyGrayEvent();
+        emptyGrayEvent.setSortMark(grayEventLog.getSortMark());
+        return emptyGrayEvent;
+    }
+
+
     protected GrayEvent decorateEvent(GrayEvent grayEvent) {
         EventConverter eventConverter = genericRetriever.retrieve(grayEvent.getClass());
         if (Objects.isNull(eventConverter)) {