From 96bb88b474f26ced3a807eef364accbeee52c78e Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sun, 20 Dec 2020 20:05:09 +0100 Subject: [PATCH] Disable execution log --- src/core/Elsa.Abstractions/Models/WorkflowInstance.cs | 4 ++-- src/core/Elsa.Abstractions/Services/CompositeActivity.cs | 1 + .../Services/Models/WorkflowExecutionContext.cs | 3 ++- .../Elsa.DistributedLocking.SqlServer/SqlLockProvider.cs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs b/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs index c0307367b..f6faddaf2 100644 --- a/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs +++ b/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs @@ -12,7 +12,7 @@ namespace Elsa.Models { Variables = new Variables(); Activities = new List(); - ExecutionLog = new List(); + //ExecutionLog = new List(); ScheduledActivities = new Stack(); PostScheduledActivities = new Stack(); ParentActivities = new Stack(); @@ -39,7 +39,7 @@ namespace Elsa.Models set => _blockingActivities = new HashSet(value, BlockingActivityEqualityComparer.Instance); } - public ICollection ExecutionLog { get; set; } + //public ICollection ExecutionLog { get; set; } public WorkflowFault? Fault { get; set; } public Stack ScheduledActivities { get; set; } public Stack PostScheduledActivities { get; set; } diff --git a/src/core/Elsa.Abstractions/Services/CompositeActivity.cs b/src/core/Elsa.Abstractions/Services/CompositeActivity.cs index 5b436fd43..5beaee27b 100644 --- a/src/core/Elsa.Abstractions/Services/CompositeActivity.cs +++ b/src/core/Elsa.Abstractions/Services/CompositeActivity.cs @@ -22,6 +22,7 @@ namespace Elsa.Services if (IsScheduled) { context.WorkflowExecutionContext.WorkflowInstance.ParentActivities.Pop(); + IsScheduled = false; return Complete(context); } diff --git a/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs b/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs index b9c5daa15..12627b691 100644 --- a/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs +++ b/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs @@ -70,7 +70,8 @@ namespace Elsa.Services.Models } public bool DeleteCompletedInstances => WorkflowBlueprint.DeleteCompletedInstances; - public ICollection ExecutionLog => WorkflowInstance.ExecutionLog; + //public ICollection ExecutionLog => WorkflowInstance.ExecutionLog; + public ICollection ExecutionLog => new List(); public WorkflowStatus Status => WorkflowInstance.WorkflowStatus; public bool HasBlockingActivities => WorkflowInstance.BlockingActivities.Any(); public object? WorkflowContext { get; set; } diff --git a/src/providers/Elsa.DistributedLocking.SqlServer/SqlLockProvider.cs b/src/providers/Elsa.DistributedLocking.SqlServer/SqlLockProvider.cs index 8fe91aacd..f354a2f79 100644 --- a/src/providers/Elsa.DistributedLocking.SqlServer/SqlLockProvider.cs +++ b/src/providers/Elsa.DistributedLocking.SqlServer/SqlLockProvider.cs @@ -17,7 +17,7 @@ namespace Elsa private const string Prefix = "elsa"; private readonly string _connectionString; private readonly IDictionary _locks = new Dictionary(); - private readonly AutoResetEvent _mutex = new AutoResetEvent(true); + private readonly AutoResetEvent _mutex = new(true); public SqlLockProvider(string connectionString, ILogger logger) {