@clairejs/server 3.21.0 → 3.21.1

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.21.0:
+#### 3.21.1:
 
+-   add log to aws job scheduler & fix cronjob sync
 -   simplify lambda job scheduler, remove job interval that is less than 60s
 
 #### 3.20.2:

package/dist/job/AwsJobScheduler.js

@@ -121,10 +121,14 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
     }
     async syncJobs() {
         //-- check jobs
+        console.log("syncJobs started");
         const scheduledJobs = await this.getAllScheduledJobs();
+        console.log("scheduledJobs", scheduledJobs);
         const allJobs = await this.getAvailableJobInfo();
+        console.log("allJobs", allJobs);
         //-- remove job that no more exist
         const nomoreExistJobs = scheduledJobs.filter((job) => !allJobs.find((j) => j.jobName === job.jobName));
+        console.log("nomoreExistJobs", nomoreExistJobs);
         for (const job of nomoreExistJobs) {
             this.logger.info(`Removing stale job: ${job.jobName} of id: ${job.id}`);
             await this.removeJob(job.id);
@@ -132,20 +136,26 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         if (nomoreExistJobs.length) {
             this.logger.info(`Cleaned up: ${nomoreExistJobs.length} stale jobs`);
         }
-        //-- remove scheduled cron jobs
+        //-- remove scheduled cron jobs that diff the cron expression
         this.logger.debug("Remove scheduled cron jobs");
         const scheduledCronJobs = scheduledJobs.filter((j) => j.cron);
-        await Promise.all(scheduledCronJobs.map((j) => this.removeJob(j.id)));
-        //-- reschedule cron & interval jobs because we might have updated the cron expression / interval value
-        const cronJobs = allJobs.filter((job) => job.cron);
-        this.logger.debug("Scheduling cron & interval jobs");
-        for (const job of cronJobs) {
-            await this.scheduleJob({
-                jobName: job.jobName,
-                cron: job.cron,
-            });
+        const unmatchedCronJobs = scheduledCronJobs.filter((j) => j.cron && !allJobs.find((job) => job.jobName === j.jobName && job.cron === j.cron));
+        if (unmatchedCronJobs.length) {
+            await Promise.all(unmatchedCronJobs.map((j) => this.removeJob(j.id)));
+            //-- reschedule new cron jobs and those which are not synced
+            const resyncCronJobs = allJobs.filter((job) => job.cron &&
+                (unmatchedCronJobs.some((j) => j.jobName === job.jobName) ||
+                    !scheduledCronJobs.some((j) => j.jobName === job.jobName)));
+            this.logger.debug("Reschedule cron jobs", resyncCronJobs);
+            for (const job of resyncCronJobs) {
+                await this.scheduleJob({
+                    jobName: job.jobName,
+                    cron: job.cron,
+                });
+            }
         }
         //-- keep "at" jobs as is
+        console.log("syncJobs finished");
     }
     async removeJob(jobId) {
         await this.eventbridge

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.21.0",
+    "version": "3.21.1",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",