diff options
| author | Cody Robibero <cody@robibe.ro> | 2021-08-04 06:24:58 -0600 |
|---|---|---|
| committer | Cody Robibero <cody@robibe.ro> | 2021-08-04 06:24:58 -0600 |
| commit | 398ca85944c21609156892dd8c5560126336f11b (patch) | |
| tree | 5ccd6d959a64a262e1db4a1583619e30775edb68 /Emby.Server.Implementations/ScheduledTasks | |
| parent | d212b6fb08fc8d45008499f3dfce33f59bb425e3 (diff) | |
| parent | 1b8eb1aefe2a10b9671e801e8b1feeb8e2362c87 (diff) | |
Merge remote-tracking branch 'upstream/master' into baseitemkind-fixes
Diffstat (limited to 'Emby.Server.Implementations/ScheduledTasks')
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/Tasks/CleanActivityLogTask.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs index d7e3207549..b343250419 100644 --- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs +++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; using Jellyfin.Data.Events; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.Json; +using Jellyfin.Extensions.Json; using MediaBrowser.Common.Progress; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanActivityLogTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanActivityLogTask.cs index 50ba9bc899..19600b1e64 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanActivityLogTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanActivityLogTask.cs @@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks throw new Exception($"Activity Log Retention days must be at least 0. Currently: {retentionDays}"); } - var startDate = DateTime.UtcNow.AddDays(retentionDays.Value * -1); + var startDate = DateTime.UtcNow.AddDays(-retentionDays.Value); return _activityManager.CleanAsync(startDate); } |