From: Jakub Dudycz <jdudycz@nokia.com>
Date: Mon, 9 Jul 2018 11:09:56 +0000 (+0200)
Subject: Fix consul configuration delay
X-Git-Tag: 1.0.0~72
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=af92961d8e79769dbd70340ab661f7a42b783435;p=dcaegen2%2Fcollectors%2Fhv-ves.git

Fix consul configuration delay

Delay configuration received from consul instead of default one

Change-Id: I09ec1a1e0d4a8334f83c054e0891b55ff8d049db
Issue-Id: ONAP-519
Signed-off-by: jdudycz@nokia.com
Issue-ID: DCAEGEN2-601
---

diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt
index 727f025b..786bc7ce 100644
--- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt
+++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt
@@ -64,7 +64,7 @@ internal class ConsulConfigurationProvider(private val url: String,
                             withFixedPartitioning()
                         }
                     }.build())
-    ).doOnNext { logger.info("Applied default configuration") }.delayElement(firstRequestDelay)
+    ).doOnNext { logger.info("Applied default configuration") }
 
     private fun createConsulFlux(): Flux<CollectorConfiguration> =
             http.get(url, mapOf(Pair("index", lastModifyIndex.get())))
@@ -79,6 +79,7 @@ internal class ConsulConfigurationProvider(private val url: String,
                     .map(::decodeConfiguration)
                     .map(::createCollectorConfiguration)
                     .repeat()
+                    .delaySubscription(firstRequestDelay)
 
     private fun parseJsonResponse(responseString: String): JsonObject =
             Json.createReader(StringReader(responseString)).readArray().first().asJsonObject()