From af34b43a8dcb15f88b4efebc7657f1ab33ff470b Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 19 Aug 2020 10:47:48 -0400
Subject: [PATCH] Reactivate the message notification experiment.

---
 .../textsecuregcm/storage/RedisClusterMessagesCache.java      | 4 ++--
 .../textsecuregcm/storage/RedisClusterMessagesCacheTest.java  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
index cea5bfe79..bebda380e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
@@ -83,7 +83,7 @@ public class RedisClusterMessagesCache extends RedisClusterPubSubAdapter<String,
         this.removeQueueScript        = ClusterLuaScript.fromResource(redisCluster, "lua/remove_queue.lua",          ScriptOutputType.STATUS);
         this.getQueuesToPersistScript = ClusterLuaScript.fromResource(redisCluster, "lua/get_queues_to_persist.lua", ScriptOutputType.MULTI);
 
-        /* pubSubConnection.usePubSubConnection(connection -> {
+        pubSubConnection.usePubSubConnection(connection -> {
             connection.addListener(this);
             connection.getResources().eventBus().get()
                     .filter(event -> event instanceof ClusterTopologyChangedEvent)
@@ -93,7 +93,7 @@ public class RedisClusterMessagesCache extends RedisClusterPubSubAdapter<String,
                     });
         });
 
-        subscribeForKeyspaceNotifications(); */
+        subscribeForKeyspaceNotifications();
     }
 
     private void subscribeForKeyspaceNotifications() {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
index 123a5b0a7..4202fe521 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
@@ -3,7 +3,6 @@ package org.whispersystems.textsecuregcm.storage;
 import io.lettuce.core.cluster.SlotHash;
 import junitparams.Parameters;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.nio.charset.StandardCharsets;
@@ -104,7 +103,6 @@ public class RedisClusterMessagesCacheTest extends AbstractMessagesCacheTest {
     }
 
     @Test(timeout = 5_000L)
-    @Ignore
     public void testNotifyListenerNewMessage() throws InterruptedException {
         final AtomicBoolean notified    = new AtomicBoolean(false);
         final UUID          messageGuid = UUID.randomUUID();
@@ -136,7 +134,6 @@ public class RedisClusterMessagesCacheTest extends AbstractMessagesCacheTest {
     }
 
     @Test(timeout = 5_000L)
-    @Ignore
     public void testNotifyListenerPersisted() throws InterruptedException {
         final AtomicBoolean notified    = new AtomicBoolean(false);