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

Disarm new message keyspace notifications.

This commit is contained in:
Jon Chambers 2020-08-14 15:51:43 -04:00 committed by Jon Chambers
parent 6fb9038af1
commit f1a74b5939
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
View File

@ -83,7 +83,7 @@ public class RedisClusterMessagesCache extends RedisClusterPubSubAdapter<String,
this.removeQueueScript = ClusterLuaScript.fromResource(redisCluster, "lua/remove_queue.lua", ScriptOutputType.STATUS); this.removeQueueScript = ClusterLuaScript.fromResource(redisCluster, "lua/remove_queue.lua", ScriptOutputType.STATUS);
this.getQueuesToPersistScript = ClusterLuaScript.fromResource(redisCluster, "lua/get_queues_to_persist.lua", ScriptOutputType.MULTI); this.getQueuesToPersistScript = ClusterLuaScript.fromResource(redisCluster, "lua/get_queues_to_persist.lua", ScriptOutputType.MULTI);
pubSubConnection.usePubSubConnection(connection -> { /* pubSubConnection.usePubSubConnection(connection -> {
connection.addListener(this); connection.addListener(this);
connection.getResources().eventBus().get() connection.getResources().eventBus().get()
.filter(event -> event instanceof ClusterTopologyChangedEvent) .filter(event -> event instanceof ClusterTopologyChangedEvent)
@ -93,7 +93,7 @@ public class RedisClusterMessagesCache extends RedisClusterPubSubAdapter<String,
}); });
}); });
subscribeForKeyspaceNotifications(); subscribeForKeyspaceNotifications(); */
} }
private void subscribeForKeyspaceNotifications() { private void subscribeForKeyspaceNotifications() {

3
service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
View File

@ -3,6 +3,7 @@ package org.whispersystems.textsecuregcm.storage;
import io.lettuce.core.cluster.SlotHash; import io.lettuce.core.cluster.SlotHash;
import junitparams.Parameters; import junitparams.Parameters;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -103,6 +104,7 @@ public class RedisClusterMessagesCacheTest extends AbstractMessagesCacheTest {
} }
@Test(timeout = 5_000L) @Test(timeout = 5_000L)
@Ignore
public void testNotifyListenerNewMessage() throws InterruptedException { public void testNotifyListenerNewMessage() throws InterruptedException {
final AtomicBoolean notified = new AtomicBoolean(false); final AtomicBoolean notified = new AtomicBoolean(false);
final UUID messageGuid = UUID.randomUUID(); final UUID messageGuid = UUID.randomUUID();
@ -134,6 +136,7 @@ public class RedisClusterMessagesCacheTest extends AbstractMessagesCacheTest {
} }
@Test(timeout = 5_000L) @Test(timeout = 5_000L)
@Ignore
public void testNotifyListenerPersisted() throws InterruptedException { public void testNotifyListenerPersisted() throws InterruptedException {
final AtomicBoolean notified = new AtomicBoolean(false); final AtomicBoolean notified = new AtomicBoolean(false);