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

Use static exception instance when a connection is closed

This commit is contained in:
Chris Eager 2023-09-07 15:23:01 -05:00 committed by Chris Eager
parent 8348263fab
commit 92bb783cbb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ import org.whispersystems.textsecuregcm.storage.MessagesManager;
import org.whispersystems.textsecuregcm.util.Constants; import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.HeaderUtils; import org.whispersystems.textsecuregcm.util.HeaderUtils;
import org.whispersystems.websocket.WebSocketClient; import org.whispersystems.websocket.WebSocketClient;
import org.whispersystems.websocket.WebSocketResourceProvider;
import org.whispersystems.websocket.messages.WebSocketResponseMessage; import org.whispersystems.websocket.messages.WebSocketResponseMessage;
import reactor.core.Disposable; import reactor.core.Disposable;
import reactor.core.observability.micrometer.Micrometer; import reactor.core.observability.micrometer.Micrometer;
@ -395,6 +396,8 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
errorType = "timeout"; errorType = "timeout";
} else if (e instanceof java.nio.channels.ClosedChannelException) { } else if (e instanceof java.nio.channels.ClosedChannelException) {
errorType = "closedChannel"; errorType = "closedChannel";
} else if (e == WebSocketResourceProvider.CONNECTION_CLOSED_EXCEPTION) {
errorType = "connectionClosed";
} else { } else {
logger.warn(terminal ? "Send message failure terminated stream" : "Send message failed", e); logger.warn(terminal ? "Send message failure terminated stream" : "Send message failed", e);
errorType = "other"; errorType = "other";

7
websocket-resources/src/main/java/org/whispersystems/websocket/WebSocketResourceProvider.java
View File

@ -47,6 +47,11 @@ import java.util.concurrent.ConcurrentHashMap;
@SuppressWarnings("OptionalUsedAsFieldOrParameterType") @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public class WebSocketResourceProvider<T extends Principal> implements WebSocketListener { public class WebSocketResourceProvider<T extends Principal> implements WebSocketListener {
/**
* A static exception instance passed to outstanding requests (via {@code completeExceptionally} in
* {@link #onWebSocketClose(int, String)}
*/
public static final IOException CONNECTION_CLOSED_EXCEPTION = new IOException("Connection closed!");
private static final Logger logger = LoggerFactory.getLogger(WebSocketResourceProvider.class); private static final Logger logger = LoggerFactory.getLogger(WebSocketResourceProvider.class);
private final Map<Long, CompletableFuture<WebSocketResponseMessage>> requestMap = new ConcurrentHashMap<>(); private final Map<Long, CompletableFuture<WebSocketResponseMessage>> requestMap = new ConcurrentHashMap<>();
@ -141,7 +146,7 @@ public class WebSocketResourceProvider<T extends Principal> implements WebSocket
CompletableFuture<WebSocketResponseMessage> outstandingRequest = requestMap.remove(requestId); CompletableFuture<WebSocketResponseMessage> outstandingRequest = requestMap.remove(requestId);
if (outstandingRequest != null) { if (outstandingRequest != null) {
outstandingRequest.completeExceptionally(new IOException("Connection closed!")); outstandingRequest.completeExceptionally(CONNECTION_CLOSED_EXCEPTION);
} }
} }
} }