Merge pull request #121 from cfg4j/atomic-consul-reload

Atomic consul reload
cfg4j · Oct 1, 2015 · 121a4fb · 121a4fb
2 parents 06db657 + d64531c
commit 121a4fb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/cfg4j-consul/src/main/java/org/cfg4j/source/consul/ConsulConfigurationSource.java b/cfg4j-consul/src/main/java/org/cfg4j/source/consul/ConsulConfigurationSource.java
@@ -101,7 +101,7 @@ public void init() {
 
   @Override
   public void reload() {
-    consulValues = new HashMap<>();
+    Map<String, String> newConsulValues = new HashMap<>();
     List<Value> valueList;
 
     try {
@@ -120,9 +120,10 @@ public void reload() {
 
       LOG.trace("Consul provided configuration key: " + value.getKey() + " with value: " + val);
 
-      consulValues.put(value.getKey(), val);
+      newConsulValues.put(value.getKey(), val);
     }
 
+    consulValues = newConsulValues;
   }
 
   @Override

diff --git a/...onsul/src/test/java/org/cfg4j/source/consul/ConsulConfigurationSourceIntegrationTest.java b/...onsul/src/test/java/org/cfg4j/source/consul/ConsulConfigurationSourceIntegrationTest.java
@@ -34,6 +34,8 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 
 
@@ -145,6 +147,19 @@ public void reloadShouldThrowOnConnectionFailure() throws Exception {
     source.reload();
   }
 
+  @Test
+  public void shouldReturnOldValuesDuringReload() throws Exception {
+    new Timer().schedule(new TimerTask() {
+      @Override
+      public void run() {
+        source.reload();
+      }
+    }, 0);
+
+    Environment environment = new ImmutableEnvironment("us-west-1");
+    assertThat(source.getConfiguration(environment)).contains(MapEntry.entry("featureA.toggle", "disabled"));
+  }
+
   private void runMockServer() throws IOException {
     server = new MockWebServer();
     server.setDispatcher(dispatcher);