iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
bskjon 2024-06-30 12:40:08 +02:00
parent a9d05511fb
commit 8153d8e9b3
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterApplication.kt
View File

@ -7,10 +7,7 @@ import no.iktdev.exfl.observable.Observables
import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
import no.iktdev.mediaprocessing.shared.common.datasource.MySqlDataSource import no.iktdev.mediaprocessing.shared.common.datasource.MySqlDataSource
import no.iktdev.mediaprocessing.shared.common.getAppVersion import no.iktdev.mediaprocessing.shared.common.getAppVersion
import no.iktdev.mediaprocessing.shared.common.persistance.PersistentEventManager import no.iktdev.mediaprocessing.shared.common.persistance.*
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.toEventsDatabase import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.runApplication import org.springframework.boot.runApplication
@ -28,6 +25,8 @@ fun getContext(): ApplicationContext? {
} }
lateinit var taskManager: TasksManager lateinit var taskManager: TasksManager
lateinit var runnerManager: RunnerManager
private lateinit var eventsDatabase: MySqlDataSource private lateinit var eventsDatabase: MySqlDataSource
private val log = KotlinLogging.logger {} private val log = KotlinLogging.logger {}
@ -54,7 +53,11 @@ fun main(args: Array<String>) {
eventsDatabase.createTables(tasks, runners) eventsDatabase.createTables(tasks, runners)
taskManager = TasksManager(eventsDatabase) taskManager = TasksManager(eventsDatabase)
runnerManager = RunnerManager(dataSource = getEventsDatabase(), name = ConvertApplication::class.java.simpleName)
runnerManager.assignRunner()
context = runApplication<ConvertApplication>(*args) context = runApplication<ConvertApplication>(*args)
log.info { "App Version: ${getAppVersion()}" } log.info { "App Version: ${getAppVersion()}" }
} }
//private val logger = KotlinLogging.logger {} //private val logger = KotlinLogging.logger {}

4
apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskCoordinator.kt
View File

@ -13,12 +13,8 @@ import org.springframework.stereotype.Service
@EnableScheduling @EnableScheduling
class TaskCoordinator(): TaskCoordinatorBase() { class TaskCoordinator(): TaskCoordinatorBase() {
private val log = KotlinLogging.logger {} private val log = KotlinLogging.logger {}
lateinit var runnerManager: RunnerManager
override fun onCoordinatorReady() { override fun onCoordinatorReady() {
super.onCoordinatorReady() super.onCoordinatorReady()
runnerManager = RunnerManager(dataSource = getEventsDatabase(), name = ConvertApplication::class.java.simpleName)
runnerManager.assignRunner()
} }

5
apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserApplication.kt
View File

@ -32,6 +32,8 @@ fun getEventsDatabase(): MySqlDataSource {
} }
lateinit var taskManager: TasksManager lateinit var taskManager: TasksManager
lateinit var runnerManager: RunnerManager
private val log = KotlinLogging.logger {} private val log = KotlinLogging.logger {}
@ -54,6 +56,9 @@ fun main(args: Array<String>) {
taskManager = TasksManager(eventsDatabase) taskManager = TasksManager(eventsDatabase)
runnerManager = RunnerManager(dataSource = getEventsDatabase(), name = ProcesserApplication::class.java.simpleName)
runnerManager.assignRunner()
val context = runApplication<ProcesserApplication>(*args) val context = runApplication<ProcesserApplication>(*args)
log.info { "App Version: ${getAppVersion()}" } log.info { "App Version: ${getAppVersion()}" }