From a6d11789e954c57e9738fdb6b90a40b286cbd574 Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Wed, 22 Feb 2023 16:59:52 -0600 Subject: [PATCH] Add `ClosedChannelException` to expected errors --- .../textsecuregcm/websocket/WebSocketConnection.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java index f6b5b9c86..30d56d9f4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java @@ -367,12 +367,13 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac .orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS)) .doOnError(e -> { final String errorType; - if (!(e instanceof TimeoutException)) { - // TimeoutExceptions are expected, no need to log + if (e instanceof TimeoutException) { + errorType = "timeout"; + } else if (e instanceof java.nio.channels.ClosedChannelException) { + errorType = "closedChannel"; + } else { logger.warn("Send message failed", e); errorType = "other"; - } else { - errorType = "timeout"; } final Tags tags = Tags.of( UserAgentTagUtil.getPlatformTag(client.getUserAgent()),