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

Update WorkflowLaunchpad.cs

Browse source 
Closes #1584
This commit is contained in:
Sipke Schoorstra 2021-10-04 15:31:48 +02:00
parent 5580bb8e76
commit a8f5da15d9
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/Elsa.Core/Services/Workflows/WorkflowLaunchpad.cs
View file

@ -110,7 +110,7 @@ namespace Elsa.Services.Workflows
{
var workflowBlueprint = await _workflowRegistry.GetAsync(workflowDefinitionId, tenantId, VersionOptions.SpecificVersion(version), cancellationToken);
if (workflowBlueprint == null)
if (workflowBlueprint == null || workflowBlueprint.IsDisabled)
return null;
return await FindStartableWorkflowAsync(workflowBlueprint, activityId, correlationId, contextId, tenantId, cancellationToken);
@ -124,13 +124,19 @@ namespace Elsa.Services.Workflows
string? tenantId = default,
CancellationToken cancellationToken = default)
{
correlationId ??= Guid.NewGuid().ToString("N");
async Task<StartableWorkflow?> CollectWorkflows()
{
var startableWorkflowDefinition = await CollectStartableWorkflowInternalAsync(workflowBlueprint, activityId, correlationId, contextId, tenantId, cancellationToken);
return startableWorkflowDefinition != null ? await InstantiateStartableWorkflow(startableWorkflowDefinition, cancellationToken) : default;
}
if (string.IsNullOrEmpty(correlationId))
return await CollectWorkflows();
// Acquire a lock on correlation ID to prevent duplicate workflow instances from being created.
await using var correlationLockHandle = await AcquireLockAsync(correlationId, cancellationToken);
return await CollectWorkflows();
var startableWorkflowDefinition = await CollectStartableWorkflowInternalAsync(workflowBlueprint, activityId, correlationId, contextId, tenantId, cancellationToken);
return startableWorkflowDefinition != null ? await InstantiateStartableWorkflow(startableWorkflowDefinition, cancellationToken) : default;
}
public async Task FindAndExecuteStartableWorkflowAsync(
@ -254,7 +260,7 @@ namespace Elsa.Services.Workflows
private async Task<StartableWorkflowDefinition?> CollectStartableWorkflowInternalAsync(
IWorkflowBlueprint workflowBlueprint,
string? activityId,
string correlationId,
string? correlationId,
string? contextId = default,
string? tenantId = default,
CancellationToken cancellationToken = default)