improve workflow scheduling

davidrneves · Jul 5, 2018 · 0877986 · 0877986
1 parent 29db20e
commit 0877986
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/src/WorkflowCore/Services/WorkflowExecutor.cs b/src/WorkflowCore/Services/WorkflowExecutor.cs
@@ -199,6 +199,7 @@ private void ProcessAfterExecutionIteration(WorkflowInstance workflow, WorkflowD
 
         private void DetermineNextExecutionTime(WorkflowInstance workflow)
         {
+            //TODO: move to own class
             workflow.NextExecution = null;
 
             if (workflow.Status == WorkflowStatus.Complete)
@@ -212,33 +213,33 @@ private void DetermineNextExecutionTime(WorkflowInstance workflow)
                     return;
                 }
 
-                long pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
+                var pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
                 workflow.NextExecution = Math.Min(pointerSleep, workflow.NextExecution ?? pointerSleep);
             }
 
             if (workflow.NextExecution == null)
             {
                 foreach (var pointer in workflow.ExecutionPointers.Where(x => x.Active && (x.Children ?? new List<string>()).Count > 0))
                 {
-                    if (workflow.ExecutionPointers.Where(x => pointer.Children.Contains(x.Id)).All(x => x.EndTime.HasValue))
+                    if (!workflow.ExecutionPointers.Where(x => x.Scope.Contains(pointer.Id)).All(x => x.EndTime.HasValue)) 
+                        continue;
+
+                    if (!pointer.SleepUntil.HasValue)
                     {
-                        if (!pointer.SleepUntil.HasValue)
-                        {
-                            workflow.NextExecution = 0;
-                            return;
-                        }
-
-                        long pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
-                        workflow.NextExecution = Math.Min(pointerSleep, workflow.NextExecution ?? pointerSleep);
+                        workflow.NextExecution = 0;
+                        return;
                     }
+
+                    var pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
+                    workflow.NextExecution = Math.Min(pointerSleep, workflow.NextExecution ?? pointerSleep);
                 }
             }
 
-            if ((workflow.NextExecution == null) && (workflow.ExecutionPointers.All(x => x.EndTime != null)))
-            {
-                workflow.Status = WorkflowStatus.Complete;
-                workflow.CompleteTime = _datetimeProvider.Now.ToUniversalTime();
-            }
+            if ((workflow.NextExecution != null) || (workflow.ExecutionPointers.Any(x => x.EndTime == null))) 
+                return;
+
+            workflow.Status = WorkflowStatus.Complete;
+            workflow.CompleteTime = _datetimeProvider.Now.ToUniversalTime();
         }
 
     }

diff --git a/src/WorkflowCore/WorkflowCore.csproj b/src/WorkflowCore/WorkflowCore.csproj
@@ -15,9 +15,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
-    <Version>1.6.3</Version>
-    <AssemblyVersion>1.6.3.0</AssemblyVersion>
-    <FileVersion>1.6.3.0</FileVersion>
+    <Version>1.6.4</Version>
+    <AssemblyVersion>1.6.4.0</AssemblyVersion>
+    <FileVersion>1.6.4.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
   </PropertyGroup>