From 876d900e9bbf2eff0520be877dfc4617aaef90a8 Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 25 Mar 2024 18:39:13 +0100 Subject: [PATCH] Updated filter --- .../coordinator/tasks/event/CompleteRequestTask.kt | 2 +- .../shared/common/persistance/PersistentDataStore.kt | 10 +++++++++- .../shared/common/tasks/TaskCreatorImpl.kt | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteRequestTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteRequestTask.kt index 01970bc6..0654b00f 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteRequestTask.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteRequestTask.kt @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service class CompleteRequestTask(@Autowired override var coordinator: Coordinator) : TaskCreator(coordinator) { val log = KotlinLogging.logger {} - override val producesEvent: KafkaEvents = KafkaEvents.EVENT_MEDIA_PROCESS_COMPLETED + override val producesEvent: KafkaEvents = KafkaEvents.EVENT_REQUEST_PROCESS_COMPLETED override val requiredEvents: List = listOf( EVENT_REQUEST_PROCESS_STARTED, diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentDataStore.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentDataStore.kt index 6fa21c15..ec278777 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentDataStore.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentDataStore.kt @@ -1,5 +1,6 @@ package no.iktdev.mediaprocessing.shared.common.persistance +import mu.KotlinLogging import no.iktdev.mediaprocessing.shared.common.datasource.executeOrException import no.iktdev.mediaprocessing.shared.common.datasource.executeWithStatus import no.iktdev.mediaprocessing.shared.common.datasource.withTransaction @@ -11,6 +12,7 @@ import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.update import java.sql.SQLIntegrityConstraintViolationException +private val log = KotlinLogging.logger {} open class PersistentDataStore { fun storeEventDataMessage(event: String, message: Message<*>): Boolean { val exception = executeOrException { @@ -23,7 +25,13 @@ open class PersistentDataStore { } return if (exception == null) true else { if (exception.cause is SQLIntegrityConstraintViolationException) { - exception.printStackTrace() + log.info { "Error is of SQLIntegrityConstraintViolationException" } + try { + log.info { "Error code is: ${ (exception as ExposedSQLException).errorCode}" } + } catch (e: Exception) { + + } + //exception.printStackTrace() (exception as ExposedSQLException).errorCode == 1062 } else { diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/tasks/TaskCreatorImpl.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/tasks/TaskCreatorImpl.kt index 34d5da64..29550cf0 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/tasks/TaskCreatorImpl.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/tasks/TaskCreatorImpl.kt @@ -20,9 +20,9 @@ abstract class TaskCreatorImpl, V, L : EventBasedMessa @Autowired lateinit var producer: CoordinatorProducer fun getListener(): Tasks { - val reactableEvents: Set = requiredEvents.toSet() + listensForEvents.toSet() + val reactableEvents = (requiredEvents + listensForEvents).distinct() //val eventListenerFilter = listensForEvents.ifEmpty { requiredEvents } - return Tasks(taskHandler = this, producesEvent = producesEvent, listensForEvents = reactableEvents.toList()) + return Tasks(taskHandler = this, producesEvent = producesEvent, listensForEvents = reactableEvents) } @PostConstruct fun attachListener() {