MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `ClosedChannelException` to expected errors

This commit is contained in:
Chris Eager 2023-02-22 16:59:52 -06:00 committed by Chris Eager
parent 43f83076fa
commit a6d11789e9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
View File

@ -367,12 +367,13 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
.orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS)) .orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS))
.doOnError(e -> { .doOnError(e -> {
final String errorType; final String errorType;
if (!(e instanceof TimeoutException)) { if (e instanceof TimeoutException) {
// TimeoutExceptions are expected, no need to log errorType = "timeout";
} else if (e instanceof java.nio.channels.ClosedChannelException) {
errorType = "closedChannel";
} else {
logger.warn("Send message failed", e); logger.warn("Send message failed", e);
errorType = "other"; errorType = "other";
} else {
errorType = "timeout";
} }
final Tags tags = Tags.of( final Tags tags = Tags.of(
UserAgentTagUtil.getPlatformTag(client.getUserAgent()), UserAgentTagUtil.getPlatformTag(client.getUserAgent()),