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

Set `suppressCancel=true` in `Mono.fromFuture`

This commit is contained in:
Chris Eager 2023-09-07 14:51:31 -05:00 committed by Chris Eager
parent 48f633de11
commit 8348263fab
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,10 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
.limitRate(MESSAGE_PUBLISHER_LIMIT_RATE)
.flatMapSequential(envelope ->
Mono.fromFuture(() -> sendMessage(envelope)
.orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS))
.orTimeout(sendFuturesTimeoutMillis, TimeUnit.MILLISECONDS),
// suppressCancel=true, because attempting to cancel the future has no effect, other than
// causing dropped errors
true)
.onErrorResume(
// let the first error pass through to terminate the subscription
e -> {