[SCB-1638]servicecenter do not handle websocket PING/PONG message (#1450

)
apache · Dec 10, 2019 · fbf7cae · fbf7cae
1 parent ef6895e
commit fbf7cae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml b/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
@@ -33,7 +33,7 @@ servicecomb:
           interval: 3
         pull:
           interval: 90
-        watch: false
+        watch: true
       autodiscovery: true
 # can download config center from https://cse-bucket.obs.myhwclouds.com/LocalCSE/Local-CSE-1.0.0.zip to test dynamic config
   config:

diff --git a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
@@ -43,7 +43,7 @@ servicecomb:
           interval: 3
         pull:
           interval: 10
-        watch: false
+        watch: true
       autodiscovery: true
   # can download config center from https://cse-bucket.obs.myhwclouds.com/LocalCSE/Local-CSE-1.0.0.zip to test dynamic config
   config:

diff --git a/...in/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java b/...in/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
@@ -695,9 +695,9 @@ public void watch(String selfMicroserviceId, AsyncResultCallback<MicroserviceIns
               response = JsonUtils.readValue(bodyBuffer.getBytes(),
                   MicroserviceInstanceChangedEvent.class);
             } catch (Exception e) {
-              LOGGER.error("watcher handle microservice {} response failed, {}",
+              LOGGER.error("watcher handle microservice {} response failed.",
                   selfMicroserviceId,
-                  bodyBuffer.toString());
+                  e);
               return;
             }
             try {

diff --git a/...stry/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketUtils.java b/...stry/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketUtils.java
@@ -63,7 +63,10 @@ public static void open(IpPort ipPort, String url, Handler<Void> onOpen, Handler
           asyncResult.result().closeHandler(v -> {
             onClose.handle(v);
           });
-          asyncResult.result().handler(onMessage);
+          asyncResult.result().pongHandler(pong -> {
+            // ignore, just prevent NPE.
+          });
+          asyncResult.result().frameHandler((frame) -> onMessage.handle(frame.binaryData()));
         }
       });
     });