From 6eb72f84865aa5708fe98e9e42372f9cde0fb910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Sat, 31 Jan 2026 14:10:29 +0100 Subject: [PATCH] Small changes --- src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt | 8 ++++---- .../kotlin/no/iktdev/eventi/tasks/TaskListenerTest.kt | 4 ++-- .../iktdev/eventi/tasks/TaskPollerImplementationTest.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt b/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt index 5ba2c75..ee89fde 100644 --- a/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt +++ b/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt @@ -95,7 +95,7 @@ abstract class TaskListener(val taskType: TaskType = TaskType.CPU_INTENSIVE): Ta override fun onError(task: Task, exception: Exception) { reporter?.log(task.taskId, "Error processing task: ${exception.message}") exception.printStackTrace() - reporter?.markFailed(task.taskId) + reporter?.markFailed(task.referenceId, task.taskId) } override fun onComplete(task: Task, result: Event?) { @@ -107,7 +107,7 @@ abstract class TaskListener(val taskType: TaskType = TaskType.CPU_INTENSIVE): Ta } override fun onCancelled(task: Task) { - reporter!!.markCancelled(task.taskId) + reporter!!.markCancelled(task.referenceId, task.taskId) currentJob?.cancel() heartbeatRunner?.cancel() currentTask = null @@ -134,8 +134,8 @@ interface TaskReporter { fun markClaimed(taskId: UUID, workerId: String) fun updateLastSeen(taskId: UUID) fun markCompleted(taskId: UUID) - fun markFailed(taskId: UUID) - fun markCancelled(taskId: UUID) + fun markFailed(referenceId: UUID, taskId: UUID) + fun markCancelled(referenceId: UUID, taskId: UUID) fun updateProgress(taskId: UUID, progress: Int) fun log(taskId: UUID, message: String) fun publishEvent(event: Event) diff --git a/src/test/kotlin/no/iktdev/eventi/tasks/TaskListenerTest.kt b/src/test/kotlin/no/iktdev/eventi/tasks/TaskListenerTest.kt index 4b3280e..e64274a 100644 --- a/src/test/kotlin/no/iktdev/eventi/tasks/TaskListenerTest.kt +++ b/src/test/kotlin/no/iktdev/eventi/tasks/TaskListenerTest.kt @@ -37,8 +37,8 @@ class TaskListenerTest { override fun markClaimed(taskId: UUID, workerId: String) { claimed = true } override fun markCompleted(taskId: UUID) { consumed = true } - override fun markFailed(taskId: UUID) { consumed = true } - override fun markCancelled(taskId: UUID) {} + override fun markFailed(referenceId: UUID, taskId: UUID) { consumed = true } + override fun markCancelled(referenceId: UUID, taskId: UUID) {} override fun updateProgress(taskId: UUID, progress: Int) {} override fun publishEvent(event: Event) { events.add(event) } override fun updateLastSeen(taskId: UUID) {} diff --git a/src/test/kotlin/no/iktdev/eventi/tasks/TaskPollerImplementationTest.kt b/src/test/kotlin/no/iktdev/eventi/tasks/TaskPollerImplementationTest.kt index 7b3a8cf..c924a08 100644 --- a/src/test/kotlin/no/iktdev/eventi/tasks/TaskPollerImplementationTest.kt +++ b/src/test/kotlin/no/iktdev/eventi/tasks/TaskPollerImplementationTest.kt @@ -45,8 +45,8 @@ class TaskPollerImplementationTest : TestBase() { override fun markClaimed(taskId: UUID, workerId: String) {} override fun updateLastSeen(taskId: UUID) {} override fun markCompleted(taskId: UUID) {} - override fun markFailed(taskId: UUID) {} - override fun markCancelled(taskId: UUID) {} + override fun markFailed(referenceId: UUID,taskId: UUID) {} + override fun markCancelled(referenceId: UUID,taskId: UUID) {} override fun updateProgress(taskId: UUID, progress: Int) {} override fun log(taskId: UUID, message: String) {} override fun publishEvent(event: Event) {