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

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

This reverts commit 8348263fab.
This commit is contained in:
Chris Eager 2023-09-07 16:59:17 -05:00
parent 94b41d3a2c
commit 29ca544c95
1 changed files with 1 additions and 4 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

@ -361,10 +361,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
.limitRate(MESSAGE_PUBLISHER_LIMIT_RATE) .limitRate(MESSAGE_PUBLISHER_LIMIT_RATE)
.flatMapSequential(envelope -> .flatMapSequential(envelope ->
Mono.fromFuture(() -> sendMessage(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( .onErrorResume(
// let the first error pass through to terminate the subscription // let the first error pass through to terminate the subscription
e -> { e -> {