Merge release/3.0.1 to master

jobbrIO · Aug 21, 2023 · 3c76b57 · 3c76b57
2 parents 4bd890d + 8fe9069
commit 3c76b57
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/source/Jobbr.Server.IntegrationTests/Jobbr.Server.IntegrationTests.csproj b/source/Jobbr.Server.IntegrationTests/Jobbr.Server.IntegrationTests.csproj
@@ -28,9 +28,9 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/source/Jobbr.Server.UnitTests/Jobbr.Server.UnitTests.csproj b/source/Jobbr.Server.UnitTests/Jobbr.Server.UnitTests.csproj
@@ -22,11 +22,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
         <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="Shouldly" Version="4.1.0" />
+        <PackageReference Include="Shouldly" Version="4.2.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/source/Jobbr.Server/Scheduling/DefaultScheduler.cs b/source/Jobbr.Server/Scheduling/DefaultScheduler.cs
@@ -247,34 +247,42 @@ private void EvaluateRecurringTriggers()
         {
             lock (_evaluateTriggersLock)
             {
-                // Re-evaluate recurring triggers every n seconds
-                var activeTriggers = _jobbrRepository.GetActiveTriggers(pageSize: int.MaxValue).Items.Where(t => t.GetType() == typeof(RecurringTrigger));
-
-                var additionalItems = new List<ScheduledPlanItem>();
-
-                foreach (var trigger in activeTriggers.Cast<RecurringTrigger>())
+                try
                 {
-                    var planResult = GetPlanResult(trigger, false);
+                    // Re-evaluate recurring triggers every n seconds
+                    var activeTriggers = _jobbrRepository.GetActiveTriggers(pageSize: int.MaxValue).Items.Where(t => t.GetType() == typeof(RecurringTrigger));
 
-                    if (planResult.Action == PlanAction.Possible)
+                    var additionalItems = new List<ScheduledPlanItem>();
+
+                    foreach (var trigger in activeTriggers.Cast<RecurringTrigger>())
                     {
-                        // Check if there is already a run planned at this time
-                        var nextRunForTrigger = _jobbrRepository.GetNextJobRunByTriggerId(trigger.JobId, trigger.Id, _dateTimeProvider.GetUtcNow());
+                        var planResult = GetPlanResult(trigger, false);
 
-                        if (nextRunForTrigger == null || !nextRunForTrigger.PlannedStartDateTimeUtc.Equals(planResult.ExpectedStartDateUtc))
+                        if (planResult.Action == PlanAction.Possible)
                         {
-                            var scheduledItem = CreateNew(planResult, trigger);
-                            additionalItems.Add(scheduledItem);
+                            // Check if there is already a run planned at this time
+                            var nextRunForTrigger = _jobbrRepository.GetNextJobRunByTriggerId(trigger.JobId, trigger.Id, _dateTimeProvider.GetUtcNow());
+
+                            if (nextRunForTrigger == null || !nextRunForTrigger.PlannedStartDateTimeUtc.Equals(planResult.ExpectedStartDateUtc))
+                            {
+                                var scheduledItem = CreateNew(planResult, trigger);
+                                additionalItems.Add(scheduledItem);
+                            }
                         }
                     }
-                }
 
-                if (additionalItems.Any())
-                {
-                    _logger.LogInformation("The re-evaluation of recurring triggers caused the addition of {itemCount} scheduled items", additionalItems.Count);
-                    _currentPlan.AddRange(additionalItems);
+                    if (additionalItems.Any())
+                    {
+                        _logger.LogInformation("The re-evaluation of recurring triggers caused the addition of {itemCount} scheduled items", additionalItems.Count);
+                        _currentPlan.AddRange(additionalItems);
 
-                    PublishCurrentPlan();
+                        PublishCurrentPlan();
+                    }
+                }
+                catch (Exception e)
+                {
+                    // Internal error (e.g. DB access failure) in recurring trigger execution should not tear down Jobbr
+                    _logger.LogError(e, "Gathering information or executing of the recurring trigger failed");
                 }
             }
         }

diff --git a/source/submodules/devsupport b/source/submodules/devsupport