Change EventListener functions to non-blocking scope

BluePrintProcessingKafkaConsumer and BluePrintProcessorCluster were
both defining EventListener functions which were executed with
runBlocking. When both were enabled, kafkaconsumer would block
and cluster would never run.

Issue-ID: CCSDK-2609
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: I91813208f0474869f174da6c99280b5159859232

diff --git a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/BluePrintProcessorCluster.kt b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/BluePrintProcessorCluster.kt
index 2284a6f..513bd51 100644 (file)
--- a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/BluePrintProcessorCluster.kt
+++ b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/BluePrintProcessorCluster.kt
@@ -16,7 +16,8 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor
 
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.onap.ccsdk.cds.blueprintsprocessor.core.service.BluePrintClusterService
 import org.onap.ccsdk.cds.blueprintsprocessor.core.service.ClusterInfo
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
@@ -57,7 +58,7 @@ open class BluePrintProcessorCluster(private val bluePrintClusterService: BluePr
     private val log = logger(BluePrintProcessorCluster::class)
 
     @EventListener(ApplicationReadyEvent::class)
-    fun startAndJoinCluster() = runBlocking {
+    fun startAndJoinCluster() = GlobalScope.launch {
 
         if (BluePrintConstants.CLUSTER_ENABLED) {
 

diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt
index a95af81..1f3dd65 100644 (file)
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt
@@ -16,6 +16,7 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api
 
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -55,7 +56,7 @@ open class BluePrintProcessingKafkaConsumer(
     }
 
     @EventListener(ApplicationReadyEvent::class)
-    fun setupMessageListener() = runBlocking {
+    fun setupMessageListener() = GlobalScope.launch {
         try {
             log.info(
                 "Setting up message consumer($CONSUMER_SELECTOR)" +