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

Merge branch 'master' into arrays_in_appsettings

Browse source
This commit is contained in:
Andrey Mishurinsky 2021-07-06 10:42:34 +03:00 committed by GitHub
parent 05843c221e ef6f441943
commit 46dc29dfe1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/activities/Elsa.Activities.Http/Middleware/HttpEndpointMiddleware.cs
View file

@ -115,6 +115,28 @@ namespace Elsa.Activities.Http.Middleware
else
{
await workflowLaunchpad.ExecutePendingWorkflowAsync(pendingWorkflow, inputModel, cancellationToken);
pendingWorkflowInstance = await workflowInstanceStore.FindByIdAsync(pendingWorkflow.WorkflowInstanceId);
if (pendingWorkflowInstance is not null
&& pendingWorkflowInstance.WorkflowStatus == Elsa.Models.WorkflowStatus.Faulted
&& !httpContext.Response.HasStarted)
{
httpContext.Response.ContentType = "application/json";
httpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
var faultedResponse = JsonConvert.SerializeObject(new
{
errorMessage = $"Workflow faulted at {pendingWorkflowInstance.FaultedAt!} with error: {pendingWorkflowInstance.Fault!.Message}",
workflow = new
{
name = pendingWorkflowInstance.Name,
version = pendingWorkflowInstance.Version,
instanceId = pendingWorkflowInstance.Id
}
});
await httpContext.Response.WriteAsync(faultedResponse, cancellationToken);
}
}
}
}

1
src/samples/server/Elsa.Samples.Server.Host/Startup.cs
View file

@ -1,3 +1,4 @@
using System.Collections.Generic;
using Elsa.Server.Hangfire.Extensions;
using Hangfire;
using Microsoft.AspNetCore.Builder;