From 0a843dc086e41ee2e9835cfd8f1513bdb5b57213 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 19 Oct 2020 11:14:52 -0400
Subject: [PATCH] Tighten the "prune peers" interval; move from fixed-rate to
 fixed-delay scheduling.

---
 .../textsecuregcm/push/ClientPresenceManager.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/ClientPresenceManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/ClientPresenceManager.java
index 47062300b..e5d59d332 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/ClientPresenceManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/ClientPresenceManager.java
@@ -66,7 +66,7 @@ public class ClientPresenceManager extends RedisClusterPubSubAdapter<String, Str
     private final Meter remoteDisplacementMeter;
     private final Meter pubSubMessageMeter;
 
-    private static final int PRUNE_PEERS_INTERVAL_SECONDS = (int)Duration.ofMinutes(3).toSeconds();
+    private static final int PRUNE_PEERS_INTERVAL_SECONDS = (int)Duration.ofSeconds(30).toSeconds();
 
     static final String MANAGER_SET_KEY = "presence::managers";
 
@@ -115,7 +115,7 @@ public class ClientPresenceManager extends RedisClusterPubSubAdapter<String, Str
 
         presenceCluster.useCluster(connection -> connection.sync().sadd(MANAGER_SET_KEY, managerId));
 
-        pruneMissingPeersFuture = scheduledExecutorService.scheduleAtFixedRate(() -> {
+        pruneMissingPeersFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> {
             try {
                 pruneMissingPeers();
             } catch (final Throwable t) {