From 3efc04744ce98d20d8f0b8e1bd42f8b8a45ff3d6 Mon Sep 17 00:00:00 2001 From: bskjon Date: Thu, 25 Jul 2024 01:50:26 +0200 Subject: [PATCH] Using all events --- .../listeners/CompletedTaskListener.kt | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt index 2861a624..1cee6429 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt @@ -48,6 +48,10 @@ class CompletedTaskListener: CoordinatorEventListener() { } } + override fun shouldIHandleFailedEvents(incomingEvent: Event): Boolean { + return true + } + @Autowired override var coordinator: Coordinator? = null @@ -178,7 +182,7 @@ class CompletedTaskListener: CoordinatorEventListener() { return false } - if (!req3(started.data?.operations ?: emptyList(), viableEvents)) { + if (!req3(started.data?.operations ?: emptyList(), events)) { //log.info { "${this::class.java.simpleName} Failed Req3" } return false } @@ -401,9 +405,6 @@ class CompletedTaskListener: CoordinatorEventListener() { } override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List): Boolean { - if (doNotProduceComplete) { - return false - } val result = super.shouldIProcessAndHandleEvent(incomingEvent, events) return result } @@ -433,14 +434,14 @@ class CompletedTaskListener: CoordinatorEventListener() { } } - - - onProduceEvent(MediaProcessCompletedEvent( - metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()), - data = CompletedEventData( - events.map { it.eventId() } - ) - )) + if (!doNotProduceComplete) { + onProduceEvent(MediaProcessCompletedEvent( + metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()), + data = CompletedEventData( + events.map { it.eventId() } + ) + )) + } active = false }