Skip to content

Handling some WebSocket connection errors gracefully #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 26, 2018
Merged

Handling some WebSocket connection errors gracefully #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393787b
Handling some WebSocket connection errors gracefully
hiranya911 Mar 23, 2018
e8e2698
Logging only channel close events in debug mode
hiranya911 Mar 26, 2018
55617e9
Removing redundant null check
hiranya911 Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/com/google/firebase/database/connection/NettyWebSocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/google/firebase/database/connection/WebsocketConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down