fix: add check for nextRunAt on non-recurrent jobs

pulsecron · Nov 19, 2024 · f80b330 · f80b330
1 parent 97ee2d5
commit f80b330
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/pulse/resume-on-restart.ts b/src/pulse/resume-on-restart.ts
@@ -31,7 +31,11 @@ export const resumeOnRestart: ResumeOnRestartMethod = function (this: Pulse, res
               $or: [
                 {
                   lockedAt: { $exists: true },
-                  nextRunAt: { $ne: null },
+                  $or: [
+                    { nextRunAt: { $lte: now, $ne: null } },
+                    { nextRunAt: { $exists: false } },
+                    { nextRunAt: null },
+                  ],
                   $or: [
                     { $expr: { $eq: ['$runCount', '$finishedCount'] } },
                     { $or: [{ lastFinishedAt: { $exists: false } }, { lastFinishedAt: null }] },
@@ -40,7 +44,11 @@ export const resumeOnRestart: ResumeOnRestartMethod = function (this: Pulse, res
                 {
                   lockedAt: { $exists: false },
                   $or: [{ lastFinishedAt: { $exists: false } }, { lastFinishedAt: null }],
-                  nextRunAt: { $lte: now, $ne: null },
+                  $or: [
+                    { nextRunAt: { $lte: now, $ne: null } },
+                    { nextRunAt: { $exists: false } },
+                    { nextRunAt: null },
+                  ],
                 },
               ],
             },