From 89421946afbe9718dd3e8c6b20f17308d5fbe873 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Tue, 27 May 2025 02:45:48 +0200 Subject: [PATCH] Properly deschedule active tasks (#1413) --- .../tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt | 2 +- .../main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt index 75b6b025..aed35277 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt @@ -110,7 +110,7 @@ object ProtoBackupExport : ProtoBackupBase() { } } - HAScheduler.scheduleCron(task, "$backupMinute $backupHour */${backupInterval.inWholeDays} * *", "backup") + backupSchedulerJobId = HAScheduler.scheduleCron(task, "$backupMinute $backupHour */${backupInterval.inWholeDays} * *", "backup") } private fun createAutomatedBackup() { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt index 200160c9..49ab685f 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/Updater.kt @@ -163,7 +163,7 @@ class Updater : IUpdater { } } - HAScheduler.schedule(::autoUpdateTask, updateInterval, timeToNextExecution, "global-update") + currentUpdateTaskId = HAScheduler.schedule(::autoUpdateTask, updateInterval, timeToNextExecution, "global-update") } private fun isRunning(): Boolean =