Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 06:58:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Query for more stored messages if an update happens while we're already processing a batch.

Browse Source
This commit is contained in:
Jon Chambers
2020-09-09 14:26:13 -04:00
committed by Jon Chambers
parent 8f53152c3e
commit f766c57743
2 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,7 @@ public class WebSocketConnection implements DispatchChannel, MessageAvailability
private final WebSocketClient client;
private final String connectionId;
private int storedMessageState = 0;
private boolean processingStoredMessages = false;
private final AtomicBoolean sentInitialQueueEmptyMessage = new AtomicBoolean(false);
@@ -93,6 +94,11 @@ public class WebSocketConnection implements DispatchChannel, MessageAvailability
switch (pubSubMessage.getType().getNumber()) {
case PubSubMessage.Type.QUERY_DB_VALUE:
pubSubPersistedMeter.mark();
synchronized (this) {
storedMessageState++;
}
processStoredMessages();
break;
case PubSubMessage.Type.DELIVER_VALUE:
@@ -184,12 +190,15 @@ public class WebSocketConnection implements DispatchChannel, MessageAvailability
@VisibleForTesting
void processStoredMessages() {
final int processedState;
synchronized (this) {
if (processingStoredMessages) {
return;
}
processingStoredMessages = true;
processedState = storedMessageState;
}
OutgoingMessageEntityList messages = messagesManager.getMessagesForDevice(account.getNumber(), account.getUuid(), device.getId(), client.getUserAgent());
@@ -227,7 +236,7 @@ public class WebSocketConnection implements DispatchChannel, MessageAvailability
processingStoredMessages = false;
}
if (messages.hasMore()) {
if (messages.hasMore() || storedMessageState > processedState) {
processStoredMessages();
} else {
final boolean shouldSendEmptyQueueMessage;