Make job querying more defensive

elsa-workflows · Aug 11, 2023 · 21914db · 21914db
1 parent 13aa380
commit 21914db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/activities/Elsa.Activities.Temporal.Hangfire/Extensions/JobStorageExtensions.cs b/src/activities/Elsa.Activities.Temporal.Hangfire/Extensions/JobStorageExtensions.cs
@@ -20,8 +20,19 @@ public static IEnumerable<KeyValuePair<string, ScheduledJobDto>> EnumerateSchedu
                 jobList = api.ScheduledJobs(skip, take);
 
                 var jobs = jobList.FindAll(x => x.Value?.Job?.Type == typeof(TJob));
-                foreach (var job in jobs.Where(x => predicate((TJobModel)x.Value.Job.Args[0])))
-                    yield return job;
+                foreach (var job in jobs)
+                {
+                    var args = job.Value?.Job?.Args;
+
+                    if (args is not { Count: 1 })
+                        continue;
+
+                    if(args[0] is not TJobModel jobModel)
+                        continue;
+
+                    if (predicate(jobModel)) 
+                        yield return job;
+                }
 
                 skip += take;
             } while (jobList.Count == take);

diff --git a/...ivities/Elsa.Activities.Temporal.Hangfire/Services/HangfireWorkflowDefinitionScheduler.cs b/...ivities/Elsa.Activities.Temporal.Hangfire/Services/HangfireWorkflowDefinitionScheduler.cs
@@ -107,7 +107,7 @@ private void DeleteAllRecurringJobs()
         private IEnumerable<RecurringJobDto> QueryRecurringJobs()
         {
             using var connection = _jobStorage.GetConnection();
-            return connection.GetRecurringJobs().Where(x => x.Job.Type == typeof(RunHangfireWorkflowDefinitionJob));
+            return connection.GetRecurringJobs().Where(x => x?.Job?.Type == typeof(RunHangfireWorkflowDefinitionJob));
         }
 
         private void DeleteScheduledJob(RunHangfireWorkflowDefinitionJobModel data)