Fix consul configuration delay 67/58667/1
authorJakub Dudycz <jdudycz@nokia.com>
Mon, 9 Jul 2018 11:09:56 +0000 (13:09 +0200)
committerPiotr Jaszczyk <piotr.jaszczyk@nokia.com>
Thu, 2 Aug 2018 10:38:55 +0000 (12:38 +0200)
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

hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt

index 727f025..786bc7c 100644 (file)
@@ -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()