@solidxai/core 0.1.0 → 0.1.2

package/src/services/scheduled-jobs/scheduler.service.ts

@@ -11,6 +11,7 @@ import { CronExpressionParser } from 'cron-parser';
 @Injectable()
 export class SchedulerServiceImpl implements ISchedulerService {
     private readonly logger = new Logger(SchedulerServiceImpl.name);
+    private readonly runningJobs = new Set<string>();
 
     constructor(
         // @InjectRepository(ScheduledJob)
@@ -21,6 +22,11 @@ export class SchedulerServiceImpl implements ISchedulerService {
 
     @Cron(CronExpression.EVERY_MINUTE)
     async runScheduledJobs(): Promise<void> {
+        const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || "true";
+        if (solidSchedulerEnabled.toLowerCase() !== "true") {
+            // this.logger.debug('Solid scheduler is disabled via environment variable');
+            return;
+        }
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         if (solidCliRunning === "true") {
             return;
@@ -46,32 +52,43 @@ export class SchedulerServiceImpl implements ISchedulerService {
         // this.logger.log(`[${now.getTime()}]: scheduler service identified ${dueJobs.length} jobs to run...`);
 
         for (const job of dueJobs) {
-            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);
-            try {
-                if (!this.shouldRunNow(job, now)) {
-                    this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);
-                    continue;
-                }
+            const jobKey = String(job.id ?? job.scheduleName ?? job.job);
 
-                const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
-                if (!handler) {
-                    // this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);
-                    continue;
-                }
+            if (this.runningJobs.has(jobKey)) {
+                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);
+                continue;
+            }
 
+            if (!this.shouldRunNow(job, now)) {
+                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);
+                continue;
+            }
+
+            const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
+            if (!handler) {
+                this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);
+                continue;
+            }
+
+            this.runningJobs.add(jobKey);
+            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);
+            try {
                 // this.logger.log(`[${now.getTime()}]: scheduler service about to run job ${job.job}`);
                 await handler.execute(job);
                 // this.logger.log(`[${now.getTime()}]: scheduler service finished running job ${job.job}`);
 
                 job.isActive = true;
-                job.lastRunAt = now;
-                job.nextRunAt = this.computeNextRunAt(job, now);
+                const finishedAt = new Date();
+                job.lastRunAt = finishedAt;
+                job.nextRunAt = this.computeNextRunAt(job, finishedAt);
                 this.logger.log(`[${now.getTime()}]: scheduler service coomputed next run for ${job.job} as ${job.nextRunAt}`);
 
                 await this.scheduledJobRepo.save(job);
                 this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);
             } catch (err) {
                 this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);
+            } finally {
+                this.runningJobs.delete(jobKey);
             }
         }
     }
@@ -172,4 +189,4 @@ export class SchedulerServiceImpl implements ISchedulerService {
                 return new Date(base.getTime() + 24 * 60 * 60 * 1000);
         }
     }
-}
+}