fix: modified it to exclude already run that should not be executed (#51

)
pulsecron · Aug 16, 2024 · f066867 · f066867 · github-actions · Aug 16, 2024
1 parent 6299f37
commit f066867
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/job/run.ts b/src/job/run.ts
@@ -85,7 +85,13 @@ export const run: RunMethod = async function (this: Job) {
         throw new JobError('Undefined job');
       }
 
-      if (!this.pulse._resumeOnRestart && previousRunAt && this.pulse._readyAt >= previousRunAt) {
+      // on restart, skip the job if it's not time to run
+      if (
+        !this.pulse._resumeOnRestart &&
+        previousRunAt &&
+        this.pulse._readyAt >= previousRunAt &&
+        this.attrs.nextRunAt
+      ) {
         debug('[%s:%s] job resumeOnRestart skipped', this.attrs.name, this.attrs._id);
         resumeOnRestartSkipped = true;
         await jobCallback(undefined, 'skipped');

diff --git a/src/pulse/resume-on-restart.ts b/src/pulse/resume-on-restart.ts
@@ -24,18 +24,13 @@ export const resumeOnRestart: ResumeOnRestartMethod = function (this: Pulse, res
           $or: [
             {
               lockedAt: { $exists: true },
-              $expr: { $eq: ['$runCount', '$finishedCount'] },
+              nextRunAt: { $ne: null },
+              $or: [{ $expr: { $eq: ['$runCount', '$finishedCount'] } }, { lastFinishedAt: { $exists: false } }],
             },
             {
-              lockedAt: { $exists: true },
+              lockedAt: { $exists: false },
               lastFinishedAt: { $exists: false },
-            },
-            {
-              $and: [
-                { lockedAt: { $exists: false } },
-                { lastFinishedAt: { $exists: false } },
-                { nextRunAt: { $lte: now } },
-              ],
+              nextRunAt: { $lte: now, $ne: null },
             },
           ],
         },