This commit is contained in:
bskjon 2024-04-23 00:59:58 +02:00
parent e090e98fa5
commit ac2baa5787
3 changed files with 9 additions and 5 deletions

View File

@ -22,7 +22,7 @@ class Reporter() {
restTemplate.postForEntity(SharedConfig.uiUrl + "/encode/progress", progress, String::class.java) restTemplate.postForEntity(SharedConfig.uiUrl + "/encode/progress", progress, String::class.java)
messageTemplate.convertAndSend("/topic/encode/progress", progress) messageTemplate.convertAndSend("/topic/encode/progress", progress)
} catch (e: Exception) { } 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) restTemplate.postForEntity(SharedConfig.uiUrl + "/extract/progress", progress, String::class.java)
messageTemplate.convertAndSend("/topic/extract/progress", progress) messageTemplate.convertAndSend("/topic/extract/progress", progress)
} catch (e: Exception) { } catch (e: Exception) {
log.error { e.message } //log.error { e.message }
} }
} }

View File

@ -22,14 +22,18 @@ class ClaimsService() {
expiredClaims.forEach { expiredClaims.forEach {
log.info { "Found event with expired claim: ${it.referenceId}::${it.eventId}::${it.event}" } 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) val result = eventManager.deleteProcessEventClaim(referenceId = it.referenceId, eventId = it.eventId)
if (result) { if (result) {
log.info { "Released claim on ${it.referenceId}::${it.eventId}::${it.event}" } log.info { "Released claim on ${it.referenceId}::${it.eventId}::${it.event}" }
} else { } else {
log.error { "Failed to release claim on ${it.referenceId}::${it.eventId}::${it.event}" } 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()
} }
} }

View File

@ -59,7 +59,7 @@ class EncodeService(@Autowired override var coordinator: Coordinator, @Autowired
} }
override fun onProcessEvents(event: PersistentProcessDataMessage, events: List<PersistentProcessDataMessage>): MessageDataWrapper? { override fun onProcessEvents(event: PersistentProcessDataMessage, events: List<PersistentProcessDataMessage>): MessageDataWrapper? {
if (!requiredEvents.contains(event.event)) { if (event.event !in requiredEvents) {
return null return null
} }
if (event.data !is FfmpegWorkRequestCreated) { if (event.data !is FfmpegWorkRequestCreated) {