Merge pull request #1281 from d-lukutin/fix-cron-disabled-flag

Fix cron disabled flag
nestjs · May 17, 2023 · 726cc8c · 726cc8c
2 parents 86c4c9d + 5d21e7f
commit 726cc8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lib/scheduler.orchestrator.ts b/lib/scheduler.orchestrator.ts
@@ -67,11 +67,6 @@ export class SchedulerOrchestrator
     const cronKeys = Object.keys(this.cronJobs);
     cronKeys.forEach((key) => {
       const { options, target } = this.cronJobs[key];
-
-      if (options.disabled) {
-        return;
-      }
-
       const cronJob = new CronJob(
         options.cronTime,
         target as any,
@@ -83,7 +78,12 @@ export class SchedulerOrchestrator
         options.utcOffset,
         options.unrefTimeout,
       );
-      cronJob.start();
+
+      if (options.disabled) {
+        cronJob.stop();
+      } else {
+        cronJob.start();
+      }
 
       this.cronJobs[key].ref = cronJob;
       this.schedulerRegistry.addCronJob(key, cronJob);

diff --git a/tests/e2e/cron-jobs.spec.ts b/tests/e2e/cron-jobs.spec.ts
@@ -115,9 +115,7 @@ describe('Cron', () => {
     await app.init();
     const registry = app.get(SchedulerRegistry);
 
-    expect(() => {
-      registry.getCronJob('DISABLED');
-    }).toThrow();
+    expect(registry.getCronJob('DISABLED').running).toBeFalsy();
   });
 
   it(`should return cron id by name`, async () => {