From 8153d8e9b34920ccf9ada8ace0b383611b89c05d Mon Sep 17 00:00:00 2001 From: bskjon Date: Sun, 30 Jun 2024 12:40:08 +0200 Subject: [PATCH] Fix --- .../mediaprocessing/converter/ConverterApplication.kt | 11 +++++++---- .../mediaprocessing/converter/TaskCoordinator.kt | 4 ---- .../mediaprocessing/processer/ProcesserApplication.kt | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt index a1ea46cb..75c318c9 100644 --- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt +++ b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt @@ -7,10 +7,7 @@ import no.iktdev.exfl.observable.Observables import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig import no.iktdev.mediaprocessing.shared.common.datasource.MySqlDataSource import no.iktdev.mediaprocessing.shared.common.getAppVersion -import no.iktdev.mediaprocessing.shared.common.persistance.PersistentEventManager -import no.iktdev.mediaprocessing.shared.common.persistance.TasksManager -import no.iktdev.mediaprocessing.shared.common.persistance.runners -import no.iktdev.mediaprocessing.shared.common.persistance.tasks +import no.iktdev.mediaprocessing.shared.common.persistance.* import no.iktdev.mediaprocessing.shared.common.toEventsDatabase import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication @@ -28,6 +25,8 @@ fun getContext(): ApplicationContext? { } lateinit var taskManager: TasksManager +lateinit var runnerManager: RunnerManager + private lateinit var eventsDatabase: MySqlDataSource private val log = KotlinLogging.logger {} @@ -54,7 +53,11 @@ fun main(args: Array) { eventsDatabase.createTables(tasks, runners) taskManager = TasksManager(eventsDatabase) + runnerManager = RunnerManager(dataSource = getEventsDatabase(), name = ConvertApplication::class.java.simpleName) + runnerManager.assignRunner() + context = runApplication(*args) log.info { "App Version: ${getAppVersion()}" } + } //private val logger = KotlinLogging.logger {} \ No newline at end of file diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt index b3a7409e..daf48d73 100644 --- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt +++ b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt @@ -13,12 +13,8 @@ import org.springframework.stereotype.Service @EnableScheduling class TaskCoordinator(): TaskCoordinatorBase() { private val log = KotlinLogging.logger {} - lateinit var runnerManager: RunnerManager - override fun onCoordinatorReady() { super.onCoordinatorReady() - runnerManager = RunnerManager(dataSource = getEventsDatabase(), name = ConvertApplication::class.java.simpleName) - runnerManager.assignRunner() } diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt index ec30c4a0..3032c451 100644 --- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt +++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt @@ -32,6 +32,8 @@ fun getEventsDatabase(): MySqlDataSource { } lateinit var taskManager: TasksManager +lateinit var runnerManager: RunnerManager + private val log = KotlinLogging.logger {} @@ -54,6 +56,9 @@ fun main(args: Array) { taskManager = TasksManager(eventsDatabase) + runnerManager = RunnerManager(dataSource = getEventsDatabase(), name = ProcesserApplication::class.java.simpleName) + runnerManager.assignRunner() + val context = runApplication(*args) log.info { "App Version: ${getAppVersion()}" }