Merge pull request #170 from bpitman/master

Create config option to [not] wait for dynamic prop init
Netflix · Sep 11, 2015 · 44bbac6 · 44bbac6
2 parents 8aaed25 + 2dc41d7
commit 44bbac6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/iep-platformservice/src/main/java/com/netflix/iep/platformservice/PlatformServiceModule.java b/iep-platformservice/src/main/java/com/netflix/iep/platformservice/PlatformServiceModule.java
@@ -134,9 +134,10 @@ private static Callable<PollingResponse> getCallback(Config cfg) throws Exceptio
   }
 
   private static PollingStrategy getPollingStrategy(Config cfg) {
-    final String prop = "netflix.iep.archaius.polling-interval";
-    final long interval = cfg.getDuration(prop, TimeUnit.MILLISECONDS);
-    return new FixedPollingStrategy(interval, TimeUnit.MILLISECONDS);
+    final String propPollingInterval = "netflix.iep.archaius.polling-interval";
+    final String propSyncInit = "netflix.iep.archaius.sync-init";
+    final long interval = cfg.getDuration(propPollingInterval, TimeUnit.MILLISECONDS);
+    return new FixedPollingStrategy(interval, TimeUnit.MILLISECONDS, cfg.getBoolean(propSyncInit));
   }
 
   public static PollingDynamicConfig getDynamicConfig(Config cfg) throws Exception {

diff --git a/iep-platformservice/src/main/resources/reference.conf b/iep-platformservice/src/main/resources/reference.conf
@@ -1,4 +1,5 @@
 
 netflix.iep.archaius {
+  sync-init = true
   polling-interval = 30s
-}
+}