From a3a94a5f8c8cd56f6da867a2686b9e2aebb9185e Mon Sep 17 00:00:00 2001 From: bskjon Date: Sat, 20 Apr 2024 19:28:00 +0200 Subject: [PATCH] Update --- .../coordinator/tasks/event/CreateEncodeWorkTask.kt | 8 +++++++- .../coordinator/tasks/event/CreateExtractWorkTask.kt | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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 cc04a373..1ad52efb 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 @@ -22,7 +22,13 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: Coordinator) : C log.info { "${event.referenceId} triggered by ${event.event}" } val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterEncodeCreated) { - events.findLast { it.event == KafkaEvents.EventMediaParameterEncodeCreated } ?: event + val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterEncodeCreated } + if (sevent != null) { + log.info { "${event.referenceId} ${event.event} is not of ${KafkaEvents.EventMediaParameterEncodeCreated}, swapping to found event" } + } else { + log.info { "${event.referenceId} ${event.event} is not of ${KafkaEvents.EventMediaParameterEncodeCreated}, could not find required event.." } + } + sevent ?: event } else event 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 4a19492a..31761d6b 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 @@ -22,7 +22,13 @@ class CreateExtractWorkTask(@Autowired override var coordinator: Coordinator) : log.info { "${event.referenceId} triggered by ${event.event}" } val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterExtractCreated) { - events.findLast { it.event == KafkaEvents.EventMediaParameterExtractCreated } ?: event + val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterExtractCreated } + if (sevent != null) { + log.info { "${event.referenceId} ${event.event} is not of ${KafkaEvents.EventMediaParameterExtractCreated}, swapping to found event" } + } else { + log.info { "${event.referenceId} ${event.event} is not of ${KafkaEvents.EventMediaParameterExtractCreated}, could not find required event.." } + } + sevent ?: event } else event return super.onProcessEvents(forwardEvent, events)