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

Rename Timers triggers

Browse source
This commit is contained in:
Sipke Schoorstra 2020-12-04 10:48:10 +01:00
parent 659236b4ca
commit 1a9d0ab5bc
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs
View file

@ -27,8 +27,8 @@ namespace Microsoft.Extensions.DependencyInjection
.AddActivity<Cron>()
.AddActivity<Timer>()
.AddActivity<StartAt>()
.AddTriggerProvider<TimerEventTriggerProvider>()
.AddTriggerProvider<CronEventTriggerProvider>()
.AddTriggerProvider<TimerTriggerProvider>()
.AddTriggerProvider<CronTriggerProvider>()
.AddTriggerProvider<StartAtTriggerProvider>();
}

8
src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs
View file

@ -99,11 +99,11 @@ namespace Elsa.Activities.Timers.HostedServices
}
// Schedule workflow instances that are blocked on a timer event.
var timerEventTriggers = await workflowSelector.SelectWorkflowsAsync<TimerEventTrigger>(x => true, cancellationToken);
var timerEventTriggers = await workflowSelector.SelectWorkflowsAsync<TimerTrigger>(x => true, cancellationToken);
foreach (var result in timerEventTriggers)
{
var trigger = (TimerEventTrigger) result.Trigger;
var trigger = (TimerTrigger) result.Trigger;
var activity = result.WorkflowBlueprint.GetActivity(result.ActivityId)!;
await _workflowScheduler.ScheduleWorkflowAsync(result.WorkflowBlueprint, result.WorkflowInstanceId!, activity.Id, trigger.ExecuteAt, cancellationToken);
}
@ -129,11 +129,11 @@ namespace Elsa.Activities.Timers.HostedServices
}
// Schedule workflow instances blocked on a cron event.
var cronEventTriggers = await workflowSelector.SelectWorkflowsAsync<CronEventTrigger>(x => true, cancellationToken);
var cronEventTriggers = await workflowSelector.SelectWorkflowsAsync<CronTrigger>(x => true, cancellationToken);
foreach (var result in cronEventTriggers)
{
var trigger = (CronEventTrigger) result.Trigger;
var trigger = (CronTrigger) result.Trigger;
var activity = result.WorkflowBlueprint.GetActivity(result.ActivityId)!;
await _workflowScheduler.ScheduleWorkflowAsync(result.WorkflowBlueprint, result.WorkflowInstanceId!, activity.Id, trigger.ExecuteAt, cancellationToken);
}

6
src/activities/Elsa.Activities.Timers/Triggers/CronEventTrigger.cs → src/activities/Elsa.Activities.Timers/Triggers/CronTrigger.cs
View file

@ -4,12 +4,12 @@ using NodaTime;
namespace Elsa.Activities.Timers.Triggers
{
public class CronEventTrigger : Trigger
public class CronTrigger : Trigger
{
public Instant ExecuteAt { get; set; }
}
public class CronEventTriggerProvider : TriggerProvider<CronEventTrigger, Cron>
public class CronTriggerProvider : TriggerProvider<CronTrigger, Cron>
{
public override ITrigger GetTrigger(TriggerProviderContext<Cron> context)
{
@ -18,7 +18,7 @@ namespace Elsa.Activities.Timers.Triggers
if (executeAt == null || context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.Status != WorkflowStatus.Suspended)
return NullTrigger.Instance;
return new CronEventTrigger
return new CronTrigger
{
ExecuteAt = executeAt.Value,
};

6
src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs → src/activities/Elsa.Activities.Timers/Triggers/TimerTrigger.cs
View file

@ -4,12 +4,12 @@ using NodaTime;
namespace Elsa.Activities.Timers.Triggers
{
public class TimerEventTrigger : Trigger
public class TimerTrigger : Trigger
{
public Instant ExecuteAt { get; set; }
}
public class TimerEventTriggerProvider : TriggerProvider<TimerEventTrigger, Timer>
public class TimerTriggerProvider : TriggerProvider<TimerTrigger, Timer>
{
public override ITrigger GetTrigger(TriggerProviderContext<Timer> context)
{
@ -18,7 +18,7 @@ namespace Elsa.Activities.Timers.Triggers
if (executeAt == null || context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.Status != WorkflowStatus.Suspended)
return NullTrigger.Instance;
return new TimerEventTrigger
return new TimerTrigger
{
ExecuteAt = executeAt.Value,
};