@abtnode/queue 1.16.17-beta-2ac96448 → 1.16.17-beta-3232a7af

package/lib/index.js

@@ -120,6 +120,8 @@ module.exports = function createQueue({ file, store, onJob, options = {} }) {
 
     const id = getJobId(jobId, job);
 
+    logger.info('push', { job, jobId, persist, delay, id });
+
     if (delay) {
       if (!enableScheduledJob) {
         throw new Error('The queue must have options.enableScheduledJob set to true to run delay jobs');
@@ -148,14 +150,14 @@ module.exports = function createQueue({ file, store, onJob, options = {} }) {
 
     const onJobComplete = async (err, result) => {
       if (result === CANCELLED) {
+        await clearJob(id);
         emit('cancelled', { id, job, result });
-        clearJob(id);
         return;
       }
 
       if (!err) {
+        await clearJob(id);
         emit('finished', { id, job, result });
-        clearJob(id);
         return;
       }
 
@@ -266,8 +268,16 @@ module.exports = function createQueue({ file, store, onJob, options = {} }) {
         try {
           /* eslint-disable no-await-in-loop */
           const jobs = await store.getScheduledJobs();
+
+          logger.info('loop.$jobs', jobs);
+          logger.info(
+            'loop.$job.ids',
+            jobs.map((x) => x.id)
+          );
+
           for (const x of jobs) {
             if (x.job && x.id) {
+              await cancel(x.id);
               push(x.job, x.id, false);
             } else {
               logger.info('skip invalid job from db', { job: x });

package/lib/store/sequelize.js

@@ -21,7 +21,7 @@ class SequelizeStore {
 
   getScheduledJobs() {
     return this.db.find(
-      { queue: this.queue, delay: { $exists: true }, willRunAt: { $lte: Date.now() } },
+      { queue: this.queue, delay: { $exists: true }, willRunAt: { $lte: Date.now() }, cancelled: false },
       {},
       { createdAt: 1 }
     );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-2ac96448",
+  "version": "1.16.17-beta-3232a7af",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,13 +19,13 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/db": "1.16.17-beta-2ac96448",
-    "@abtnode/util": "1.16.17-beta-2ac96448",
+    "@abtnode/db": "1.16.17-beta-3232a7af",
+    "@abtnode/util": "1.16.17-beta-3232a7af",
     "debug": "^4.3.4",
     "fastq": "^1.13.0",
     "uuid": "^8.3.2"
   },
-  "gitHead": "3f18c2e1dd086879b22faf92b6b6954898ed72ef",
+  "gitHead": "af4067dd2e418c51a0ed96b1ee242ca812904056",
   "devDependencies": {
     "jest": "^27.5.1"
   }