SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix CronEvent

Browse source
This commit is contained in:
Sipke Schoorstra 2019-09-28 12:50:40 +02:00
parent 9bd00619c8
commit 9bef97fd0e
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/activities/Elsa.Activities.Timers/Activities/CronEvent.cs
View file

@ -43,19 +43,27 @@ namespace Elsa.Activities.Timers.Activities
get => GetState<Instant?>();
set => SetState(value);
}
protected override async Task<bool> OnCanExecuteAsync(WorkflowExecutionContext context, CancellationToken cancellationToken)
{
return StartTime == null || await IsExpiredAsync(context, cancellationToken);
}
protected override ActivityExecutionResult OnExecute(WorkflowExecutionContext workflowContext)
{
StartTime = clock.GetCurrentInstant();
return Halt();
}
protected override async Task<ActivityExecutionResult> OnResumeAsync(WorkflowExecutionContext workflowContext,
protected override async Task<ActivityExecutionResult> OnResumeAsync(WorkflowExecutionContext context,
CancellationToken cancellationToken)
{
var isExpired = await IsExpiredAsync(workflowContext, cancellationToken);
return isExpired ? Done() : Halt();
if (await IsExpiredAsync(context, cancellationToken))
{
StartTime = null;
return Done();
}
return Halt();
}
private async Task<bool> IsExpiredAsync(WorkflowExecutionContext workflowContext,
@ -68,8 +76,11 @@ namespace Elsa.Activities.Timers.Activities
);
var schedule = CrontabSchedule.Parse(cronExpression);
var now = clock.GetCurrentInstant();
var startTime = StartTime ?? now;
var nextOccurrence = schedule.GetNextOccurrence(startTime.ToDateTimeUtc());
if (StartTime == null)
StartTime = now;
var nextOccurrence = schedule.GetNextOccurrence(StartTime.Value.ToDateTimeUtc());
return now.ToDateTimeUtc() >= nextOccurrence;
}