Skip to content

fixed schdule drift (happy path) #7047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r90727 wants to merge 5 commits into
base: develop
Choose a base branch
from
+15 −15
Open

fixed schdule drift (happy path) #7047

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d12bbf3
fixed schdule drift (happy path)
r90727 Mar 1, 2026
792fe6c
Revert the CatchUpEnabled path for w/mo/y to use StartDate while keep…
r90727 Mar 2, 2026
b19a01e
Merge branch 'develop' into fix/scheduler-happy-path-drift
r90727 Mar 2, 2026
0f9444e
Revert the CatchUpEnabled path in StopScheduleInProgress() for w/mo/y…
r90727 Mar 2, 2026
8f3d07a
Merge branch 'develop' into fix/scheduler-happy-path-drift
r90727 Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions DNN Platform/Library/Services/Scheduling/Scheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information
namespace DotNetNuke.Services.Scheduling
Expand Down Expand Up @@ -891,25 +891,25 @@ public static void WorkCompleted(SchedulerClient schedulerClient)
switch (scheduleHistoryItem.TimeLapseMeasurement)
{
case "s":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddSeconds(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddSeconds(scheduleHistoryItem.TimeLapse);
break;
case "m":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddMinutes(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddMinutes(scheduleHistoryItem.TimeLapse);
break;
case "h":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddHours(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddHours(scheduleHistoryItem.TimeLapse);
break;
case "d":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddDays(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddDays(scheduleHistoryItem.TimeLapse);
break;
case "w":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddDays(scheduleHistoryItem.TimeLapse * 7);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddDays(scheduleHistoryItem.TimeLapse * 7);
break;
case "mo":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddMonths(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddMonths(scheduleHistoryItem.TimeLapse);
break;
case "y":
scheduleHistoryItem.NextStart = scheduleHistoryItem.StartDate.AddYears(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart = scheduleHistoryItem.NextStart.AddYears(scheduleHistoryItem.TimeLapse);
break;
}
}
Expand Down Expand Up @@ -1201,31 +1201,31 @@ public static void StopScheduleInProgress(ScheduleItem scheduleItem, ScheduleHis
{
case "s":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddSeconds(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart.AddSeconds(scheduleHistoryItem.TimeLapse);
break;
case "m":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddMinutes(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart.AddMinutes(scheduleHistoryItem.TimeLapse);
break;
case "h":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddHours(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart.AddHours(scheduleHistoryItem.TimeLapse);
break;
case "d":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddDays(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart.AddDays(scheduleHistoryItem.TimeLapse);
break;
case "w":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddDays(scheduleHistoryItem.TimeLapse * 7);
scheduleHistoryItem.NextStart.AddDays(scheduleHistoryItem.TimeLapse * 7);
break;
case "mo":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddMonths(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart.AddMonths(scheduleHistoryItem.TimeLapse);
break;
case "y":
scheduleHistoryItem.NextStart =
scheduleHistoryItem.StartDate.AddYears(scheduleHistoryItem.TimeLapse);
scheduleHistoryItem.NextStart.AddYears(scheduleHistoryItem.TimeLapse);
break;
}
}
Expand Down