From fdd631bce0f540599b66c3d74e74adceba143ffc Mon Sep 17 00:00:00 2001 From: bskjon Date: Mon, 1 Jul 2024 00:43:04 +0200 Subject: [PATCH] Fix --- .../coordinator/tasks/event/CreateEncodeWorkTask.kt | 6 ++++++ .../coordinator/tasks/event/CreateExtractWorkTask.kt | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt index 4cb04a76..17f34a9c 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt @@ -7,6 +7,8 @@ import no.iktdev.mediaprocessing.coordinator.taskManager import no.iktdev.mediaprocessing.coordinator.tasks.event.ffmpeg.CreateProcesserWorkTask import no.iktdev.mediaprocessing.shared.common.persistance.PersistentMessage import no.iktdev.mediaprocessing.shared.common.persistance.TasksManager +import no.iktdev.mediaprocessing.shared.common.persistance.isOfEvent +import no.iktdev.mediaprocessing.shared.common.persistance.isSuccess import no.iktdev.mediaprocessing.shared.common.task.FfmpegTaskData import no.iktdev.mediaprocessing.shared.common.task.TaskType import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents @@ -30,6 +32,10 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: EventCoordinator log.info { "${event.referenceId} triggered by ${event.event}" } + if (events.lastOrNull { it.isOfEvent(KafkaEvents.EventMediaParameterEncodeCreated) }?.isSuccess() != true) { + return null + } + val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterEncodeCreated) { val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterEncodeCreated } if (sevent != null) { diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt index adb9f755..955b94cf 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt @@ -6,6 +6,8 @@ import no.iktdev.mediaprocessing.coordinator.EventCoordinator import no.iktdev.mediaprocessing.coordinator.taskManager import no.iktdev.mediaprocessing.coordinator.tasks.event.ffmpeg.CreateProcesserWorkTask import no.iktdev.mediaprocessing.shared.common.persistance.PersistentMessage +import no.iktdev.mediaprocessing.shared.common.persistance.isOfEvent +import no.iktdev.mediaprocessing.shared.common.persistance.isSuccess import no.iktdev.mediaprocessing.shared.common.task.FfmpegTaskData import no.iktdev.mediaprocessing.shared.common.task.TaskType import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents @@ -27,9 +29,12 @@ class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinato override fun onProcessEvents(event: PersistentMessage, events: List): MessageDataWrapper? { super.onProcessEventsAccepted(event, events) - log.info { "${event.referenceId} triggered by ${event.event}" } + if (events.lastOrNull { it.isOfEvent(KafkaEvents.EventMediaParameterExtractCreated) }?.isSuccess() != true) { + return null + } + val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterExtractCreated) { val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterExtractCreated } if (sevent != null) {