From b413f665d8747dd896c325cc9daa19b59e498813 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 4 Feb 2021 11:23:15 -0500
Subject: [PATCH] Make DynamicConfigurationManager not-really-Managed.

---
 .../textsecuregcm/WhisperServerService.java   |  3 ++-
 .../storage/DynamicConfigurationManager.java  | 25 ++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index e3d13654a..de4d9e752 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -324,6 +324,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     ExecutorService          gcmSenderExecutor                    = environment.lifecycle().executorService(name(getClass(), "gcmSender-%d")).maxThreads(1).minThreads(1).build();
 
     DynamicConfigurationManager dynamicConfigurationManager = new DynamicConfigurationManager(config.getAppConfig().getApplication(), config.getAppConfig().getEnvironment(), config.getAppConfig().getConfigurationName());
+    dynamicConfigurationManager.start();
+
     ExperimentEnrollmentManager experimentEnrollmentManager = new ExperimentEnrollmentManager(dynamicConfigurationManager);
 
     ClientPresenceManager      clientPresenceManager      = new ClientPresenceManager(clientPresenceCluster, recurringJobExecutor, keyspaceNotificationDispatchExecutor);
@@ -392,7 +394,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     environment.lifecycle().manage(messagePersister);
     environment.lifecycle().manage(clientPresenceManager);
     environment.lifecycle().manage(featureFlagsManager);
-    environment.lifecycle().manage(dynamicConfigurationManager);
 
     AWSCredentials         credentials               = new BasicAWSCredentials(config.getCdnConfiguration().getAccessKey(), config.getCdnConfiguration().getAccessSecret());
     AWSCredentialsProvider credentialsProvider       = new AWSStaticCredentialsProvider(credentials);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java
index a4b3aeeaf..1149ca377 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java
@@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.common.annotations.VisibleForTesting;
-import io.dropwizard.lifecycle.Managed;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,10 +20,9 @@ import org.whispersystems.textsecuregcm.util.Util;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class DynamicConfigurationManager implements Managed {
+public class DynamicConfigurationManager {
 
   private final String          application;
   private final String          environment;
@@ -33,7 +31,6 @@ public class DynamicConfigurationManager implements Managed {
   private final AmazonAppConfig appConfigClient;
 
   private final AtomicReference<DynamicConfiguration>   configuration    = new AtomicReference<>();
-  private final AtomicBoolean                           running          = new AtomicBoolean(true);
   private final Logger                                  logger           = LoggerFactory.getLogger(DynamicConfigurationManager.class);
 
   private GetConfigurationResult lastConfigResult;
@@ -67,7 +64,6 @@ public class DynamicConfigurationManager implements Managed {
     return configuration.get();
   }
 
-  @Override
   public void start() {
     configuration.set(retrieveInitialDynamicConfiguration());
 
@@ -77,21 +73,14 @@ public class DynamicConfigurationManager implements Managed {
     }
 
     new Thread(() -> {
-      while (running.get()) {
-        try {
-          retrieveDynamicConfiguration().ifPresent(configuration::set);
-        } catch (Throwable t) {
-          logger.warn("Error retrieving dynamic configuration", t);
-        }
-
-        Util.sleep(5000);
+      try {
+        retrieveDynamicConfiguration().ifPresent(configuration::set);
+      } catch (Throwable t) {
+        logger.warn("Error retrieving dynamic configuration", t);
       }
-    }).start();
-  }
 
-  @Override
-  public void stop() {
-    running.set(false);
+      Util.sleep(5000);
+    }).start();
   }
 
   private Optional<DynamicConfiguration> retrieveDynamicConfiguration() throws JsonProcessingException {