AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved some cleanup tasks within another task to ensure everything is processed at the same time.

Browse source
This commit is contained in:
Joseph Milazzo 2023-12-05 06:53:33 -06:00
parent 723fde6850
commit d2c3bd7f1c
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
API/Services/TaskScheduler.cs
View file

@ -34,7 +34,6 @@ public interface ITaskScheduler
void ScanSiteThemes(); void ScanSiteThemes();
void CovertAllCoversToEncoding(); void CovertAllCoversToEncoding();
Task CleanupDbEntries(); Task CleanupDbEntries();
Task ScrobbleUpdates(int userId);
} }
public class TaskScheduler : ITaskScheduler public class TaskScheduler : ITaskScheduler
@ -141,7 +140,6 @@ public class TaskScheduler : ITaskScheduler
} }
RecurringJob.AddOrUpdate(CleanupTaskId, () => _cleanupService.Cleanup(), Cron.Daily, RecurringJobOptions); RecurringJob.AddOrUpdate(CleanupTaskId, () => _cleanupService.Cleanup(), Cron.Daily, RecurringJobOptions);
RecurringJob.AddOrUpdate(CleanupDbTaskId, () => _cleanupService.CleanupDbEntries(), Cron.Daily, RecurringJobOptions);
RecurringJob.AddOrUpdate(RemoveFromWantToReadTaskId, () => _cleanupService.CleanupWantToRead(), Cron.Daily, RecurringJobOptions); RecurringJob.AddOrUpdate(RemoveFromWantToReadTaskId, () => _cleanupService.CleanupWantToRead(), Cron.Daily, RecurringJobOptions);
RecurringJob.AddOrUpdate(UpdateYearlyStatsTaskId, () => _statisticService.UpdateServerStatistics(), Cron.Monthly, RecurringJobOptions); RecurringJob.AddOrUpdate(UpdateYearlyStatsTaskId, () => _statisticService.UpdateServerStatistics(), Cron.Monthly, RecurringJobOptions);
@ -272,16 +270,6 @@ public class TaskScheduler : ITaskScheduler
await _cleanupService.CleanupDbEntries(); await _cleanupService.CleanupDbEntries();
} }
/// <summary>
/// TODO: Remove this for Release
/// </summary>
/// <returns></returns>
public async Task ScrobbleUpdates(int userId)
{
if (!await _licenseService.HasActiveLicense()) return;
BackgroundJob.Enqueue(() => _scrobblingService.ProcessUpdatesSinceLastSync());
}
/// <summary> /// <summary>
/// Attempts to call ScanLibraries on ScannerService, but if another scan task is in progress, will reschedule the invocation for 3 hours in future. /// Attempts to call ScanLibraries on ScannerService, but if another scan task is in progress, will reschedule the invocation for 3 hours in future.
/// </summary> /// </summary>

2
API/Services/Tasks/CleanupService.cs
View file

@ -92,6 +92,8 @@ public class CleanupService : ICleanupService
await CleanupLogs(); await CleanupLogs();
await SendProgress(0.9F, "Cleaning progress events that exceed 100%"); await SendProgress(0.9F, "Cleaning progress events that exceed 100%");
await EnsureChapterProgressIsCapped(); await EnsureChapterProgressIsCapped();
await SendProgress(0.95F, "Cleaning abandoned database rows");
await CleanupDbEntries();
await SendProgress(1F, "Cleanup finished"); await SendProgress(1F, "Cleanup finished");
_logger.LogInformation("Cleanup finished"); _logger.LogInformation("Cleanup finished");
} }