Handling some WebSocket connection errors gracefully (firebase#157)

hiranya911 · web-flow · commit a0ffae0caee2 · 2018-03-26T11:43:30.000-07:00
* Handling some WebSocket connection errors gracefully

* Logging only channel close events in debug mode

* Removing redundant null check
diff --git a/src/main/java/com/google/firebase/database/connection/NettyWebSocketClient.java b/src/main/java/com/google/firebase/database/connection/NettyWebSocketClient.java
@@ -33,6 +33,7 @@
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 
+import java.io.EOFException;
 import java.net.URI;
 import java.security.KeyStore;
 import java.util.concurrent.ExecutorService;
@@ -130,8 +131,12 @@ public void close() {
 
   @Override
   public void send(String msg) {
-    checkState(channel != null && channel.isActive(), "channel not connected for sending");
-    channel.writeAndFlush(new TextWebSocketFrame(msg));
+    checkState(channel != null, "Channel not initialized");
+    if (!channel.isActive()) {
+      eventHandler.onError(new EOFException("WebSocket channel became inactive"));
+    } else {
+      channel.writeAndFlush(new TextWebSocketFrame(msg));
+    }
   }
 
   /**
diff --git a/src/main/java/com/google/firebase/database/connection/WebsocketConnection.java b/src/main/java/com/google/firebase/database/connection/WebsocketConnection.java
@@ -324,8 +324,8 @@ public void run() {
 
     @Override
     public void onError(final Throwable e) {
-      if (e.getCause() != null && e.getCause() instanceof EOFException) {
-        logger.error("WebSocket reached EOF", e);
+      if (e instanceof EOFException || e.getCause() instanceof EOFException) {
+        logger.debug("WebSocket reached EOF", e);
       } else {
         logger.error("WebSocket error", e);
       }
