fix(api): Fix enabled/legacyFallback fallbacks in FiatStatus (#252)

spinnaker · Jul 16, 2018 · ae34dd1 · ae34dd1
1 parent 92bd5be
commit ae34dd1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatStatus.java b/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatStatus.java
@@ -31,6 +31,8 @@ public class FiatStatus {
   private final Logger log = LoggerFactory.getLogger(FiatStatus.class);
 
   private final DynamicConfigService dynamicConfigService;
+  private final FiatClientConfigurationProperties fiatClientConfigurationProperties;
+
   private final AtomicBoolean enabled;
   private final AtomicBoolean legacyFallbackEnabled;
 
@@ -39,6 +41,8 @@ public FiatStatus(Registry registry,
                     DynamicConfigService dynamicConfigService,
                     FiatClientConfigurationProperties fiatClientConfigurationProperties) {
     this.dynamicConfigService = dynamicConfigService;
+    this.fiatClientConfigurationProperties = fiatClientConfigurationProperties;
+
     this.enabled = new AtomicBoolean(
         dynamicConfigService.isEnabled("fiat", fiatClientConfigurationProperties.isEnabled())
     );
@@ -61,9 +65,10 @@ public boolean isLegacyFallbackEnabled() {
   @Scheduled(fixedDelay = 30000L)
   void refreshStatus() {
     try {
-      enabled.set(dynamicConfigService.isEnabled("fiat", enabled.get()));
-      legacyFallbackEnabled.set(dynamicConfigService.isEnabled("fiat.legacyFallback", legacyFallbackEnabled.get()));
-
+      enabled.set(dynamicConfigService.isEnabled("fiat", fiatClientConfigurationProperties.isEnabled()));
+      legacyFallbackEnabled.set(
+          dynamicConfigService.isEnabled("fiat.legacyFallback", fiatClientConfigurationProperties.isLegacyFallback())
+      );
     } catch (Exception e) {
       log.warn("Unable to refresh fiat status, reason: {}", e.getMessage());
     }