From ac2baa5787cb26aa8cedb3882f82f00d9c159f28 Mon Sep 17 00:00:00 2001
From: bskjon <bskjon@outlook.com>
Date: Tue, 23 Apr 2024 00:59:58 +0200
Subject: [PATCH] Test

---
 .../no/iktdev/mediaprocessing/processer/Reporter.kt       | 4 ++--
 .../mediaprocessing/processer/services/ClaimsService.kt   | 8 ++++++--
 .../mediaprocessing/processer/services/EncodeService.kt   | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt
index f64bfefa..82c3f07f 100644
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt
+++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Reporter.kt
@@ -22,7 +22,7 @@ class Reporter() {
             restTemplate.postForEntity(SharedConfig.uiUrl + "/encode/progress", progress, String::class.java)
             messageTemplate.convertAndSend("/topic/encode/progress", progress)
         } catch (e: Exception) {
-            log.error { e.message }
+            //log.error { e.message }
         }
     }
 
@@ -31,7 +31,7 @@ class Reporter() {
             restTemplate.postForEntity(SharedConfig.uiUrl + "/extract/progress", progress, String::class.java)
             messageTemplate.convertAndSend("/topic/extract/progress", progress)
         } catch (e: Exception) {
-            log.error { e.message }
+            //log.error { e.message }
         }
     }
 
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ClaimsService.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ClaimsService.kt
index 980620e2..8cc58b78 100644
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ClaimsService.kt
+++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ClaimsService.kt
@@ -22,14 +22,18 @@ class ClaimsService() {
         expiredClaims.forEach {
             log.info { "Found event with expired claim: ${it.referenceId}::${it.eventId}::${it.event}" }
         }
-        expiredClaims.forEach {
+        val released = expiredClaims.mapNotNull {
             val result = eventManager.deleteProcessEventClaim(referenceId = it.referenceId, eventId = it.eventId)
             if (result) {
                 log.info { "Released claim on ${it.referenceId}::${it.eventId}::${it.event}" }
             } else {
                 log.error { "Failed to release claim on ${it.referenceId}::${it.eventId}::${it.event}" }
             }
+            it
+        }
+        released.forEach {
+            log.info { "Sending released ${it.referenceId} ${it.event} into queue" }
+            coordinator.readAllMessagesFor(it.referenceId, it.eventId)
         }
-        coordinator.readAllAvailableInQueue()
     }
 }
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt
index 16db1151..f21c6cde 100644
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt
+++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeService.kt
@@ -59,7 +59,7 @@ class EncodeService(@Autowired override var coordinator: Coordinator, @Autowired
     }
 
     override fun onProcessEvents(event: PersistentProcessDataMessage, events: List<PersistentProcessDataMessage>): MessageDataWrapper? {
-        if (!requiredEvents.contains(event.event)) {
+        if (event.event !in requiredEvents) {
             return null
         }
         if (event.data !is FfmpegWorkRequestCreated) {