qdone 2.0.28-alpha → 2.0.29-alpha

package/commonjs/src/consumer.js

@@ -183,7 +183,7 @@ function processMessages(queues, callback, options) {
                                         if (messages.length) {
                                             for (_i = 0, messages_1 = messages; _i < messages_1.length; _i++) {
                                                 message = messages_1[_i];
-                                                jobExecutor.executeJob(message, callback, qname, qrl, function () { return queueManager.updateIcehouse(qrl, true); });
+                                                jobExecutor.executeJob(message, callback, qname, qrl);
                                             }
                                             queueManager.updateIcehouse(qrl, false);
                                         }
@@ -231,7 +231,7 @@ function processMessages(queues, callback, options) {
                     targetJobs = Math.round(allowedJobs * overallFactor);
                     jobsLeft = targetJobs;
                     if (opt.verbose) {
-                        console.error({ jobCount: jobExecutor.activeJobCount(), freeMemory: freeMemory, totalMemory: totalMemory, freememThreshold: freememThreshold, remainingMemory: remainingMemory, memoryThreshold: memoryThreshold, maxReturnCount: maxReturnCount, allowedJobs: allowedJobs, maxLatency: maxLatency, latency: latency, latencyFactor: latencyFactor, freememFactor: freememFactor, oneMinuteLoad: oneMinuteLoad, loadPerCore: loadPerCore, loadFactor: loadFactor, overallFactor: overallFactor, targetJobs: targetJobs, activeQrls: activeQrls });
+                        console.error({ maxConcurrentJobs: opt.maxConcurrentJobs, jobCount: jobExecutor.activeJobCount(), allowedJobs: allowedJobs, maxLatency: maxLatency, latencyFactor: latencyFactor, freememFactor: freememFactor, loadFactor: loadFactor, overallFactor: overallFactor, targetJobs: targetJobs, activeQrls: activeQrls });
                     }
                     for (_i = 0, _a = queueManager.getPairs(); _i < _a.length; _i++) {
                         _b = _a[_i], qname = _b.qname, qrl = _b.qrl;

package/commonjs/src/scheduler/queueManager.js

@@ -95,8 +95,11 @@ var QueueManager = /** @class */ (function () {
             var secondsElapsed = Math.round((now - lastCheck) / 1000);
             debug({ icehouseCheck: { qrl: qrl, lastCheck: lastCheck, secondsToWait: secondsToWait, secondsElapsed: secondsElapsed } });
             var letOut = secondsElapsed > secondsToWait;
-            if (letOut && this.opt.verbose) {
-                console.error(chalk_1.default.blue('Coming out of icehouse:'), qrl);
+            if (letOut) {
+                delete this.icehouse[qrl];
+                if (this.opt.verbose) {
+                    console.error(chalk_1.default.blue('Coming out of icehouse:'), qrl);
+                }
             }
             return !letOut;
         }
@@ -125,7 +128,10 @@ var QueueManager = /** @class */ (function () {
                     case 1:
                         pairs = _a.sent();
                         if (this.opt.verbose)
-                            console.error(chalk_1.default.blue('Resolving queues:'));
+                            console.error(chalk_1.default.blue('Resolving queues:'), pairs.map(function (_a) {
+                                var qname = _a.qname;
+                                return qname;
+                            }));
                         if (this.shutdownRequested)
                             return [2 /*return*/];
                         now = new Date();
@@ -142,6 +148,13 @@ var QueueManager = /** @class */ (function () {
                             var qname = _a.qname, qrl = _a.qrl;
                             var isFifo = qname.endsWith('.fifo');
                             return _this.opt.fifo ? isFifo : true;
+                        })
+                            // next dead
+                            .filter(function (_a) {
+                            var qname = _a.qname, qrl = _a.qrl;
+                            var isFifo = qname.endsWith('.fifo');
+                            var isDead = isFifo ? qname.endsWith('_dead.fifo') : qname.endsWith('_dead');
+                            return !isDead;
                         })
                             // then icehouse
                             .filter(function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdone",
-  "version": "2.0.28-alpha",
+  "version": "2.0.29-alpha",
   "description": "Language agnostic job queue for SQS",
   "type": "module",
   "main": "./index.js",

package/src/consumer.js

@@ -97,7 +97,7 @@ export async function processMessages (queues, callback, options) {
       if (!shutdownRequested) {
         if (messages.length) {
           for (const message of messages) {
-            jobExecutor.executeJob(message, callback, qname, qrl, () => queueManager.updateIcehouse(qrl, true))
+            jobExecutor.executeJob(message, callback, qname, qrl)
           }
           queueManager.updateIcehouse(qrl, false)
         } else {
@@ -146,7 +146,7 @@ export async function processMessages (queues, callback, options) {
     let jobsLeft = targetJobs
 
     if (opt.verbose) {
-      console.error({ jobCount: jobExecutor.activeJobCount(), freeMemory, totalMemory, freememThreshold, remainingMemory, memoryThreshold, maxReturnCount, allowedJobs, maxLatency, latency, latencyFactor, freememFactor, oneMinuteLoad, loadPerCore, loadFactor, overallFactor, targetJobs, activeQrls })
+      console.error({ maxConcurrentJobs: opt.maxConcurrentJobs, jobCount: jobExecutor.activeJobCount(), allowedJobs, maxLatency, latencyFactor, freememFactor, loadFactor, overallFactor, targetJobs, activeQrls })
     }
     for (const { qname, qrl } of queueManager.getPairs()) {
       // debug({ evaluating: { qname, qrl, jobsLeft, activeQrlsHasQrl: activeQrls.has(qrl) } })

package/src/scheduler/queueManager.js

@@ -57,8 +57,11 @@ export class QueueManager {
       const secondsElapsed = Math.round((now - lastCheck) / 1000)
       debug({ icehouseCheck: { qrl, lastCheck, secondsToWait, secondsElapsed } })
       const letOut = secondsElapsed > secondsToWait
-      if (letOut && this.opt.verbose) {
-        console.error(chalk.blue('Coming out of icehouse:'), qrl)
+      if (letOut) {
+        delete this.icehouse[qrl]
+        if (this.opt.verbose) {
+          console.error(chalk.blue('Coming out of icehouse:'), qrl)
+        }
       }
       return !letOut
     } else {
@@ -79,7 +82,7 @@ export class QueueManager {
     // Start processing
     const qnames = this.queues.map(queue => normalizeQueueName(queue, this.opt))
     const pairs = await getQnameUrlPairs(qnames, this.opt)
-    if (this.opt.verbose) console.error(chalk.blue('Resolving queues:'))
+    if (this.opt.verbose) console.error(chalk.blue('Resolving queues:'), pairs.map(({ qname }) => qname))
 
     if (this.shutdownRequested) return
 
@@ -97,6 +100,12 @@ export class QueueManager {
         const isFifo = qname.endsWith('.fifo')
         return this.opt.fifo ? isFifo : true
       })
+      // next dead
+      .filter(({ qname, qrl }) => {
+        const isFifo = qname.endsWith('.fifo')
+        const isDead = isFifo ? qname.endsWith('_dead.fifo') : qname.endsWith('_dead')
+        return !isDead
+      })
       // then icehouse
       .filter(({ qname, qrl }) => !this.keepInIcehouse(qrl, now))