keuss 1.6.10 → 1.6.11

package/Pipeline/Queue.js

@@ -167,6 +167,10 @@ class PipelinedMongoQueue extends Queue {
       this._embed_update_for_payload (upd, opts.update);
     }
 
+    if (opts.hdrs) {
+      _.each (opts.hdrs, (v, k) => upd.$set['hdrs.' + k] = v);
+    }
+
     this._col.updateOne (q, upd, {}, (err, result) => {
       if (err) return callback (err);
       callback (null, result && (result.modifiedCount == 1));
@@ -274,9 +278,15 @@ class PipelinedMongoQueue extends Queue {
 
 
   //////////////////////////////////////////////
-  // redefnition
+  // redefinition from Queue
   _move_to_deadletter (obj, cb) {
-    this.pl_step (obj._id, this._factory.deadletter_queue (), {}, (err, res) => {
+    const hdrs = {
+      'x-dl-from-queue': this.name (),
+      'x-dl-t': new Date().toISOString (),
+      'x-dl-tries': obj.tries
+    };
+
+    this.pl_step (obj._id, this._factory.deadletter_queue (), {hdrs}, (err, res) => {
       if (err) return cb (err);
       this._stats.incr ('get');
       this._factory.deadletter_queue ()._stats.incr ('put');

package/Queue.js

@@ -433,14 +433,14 @@ class Queue {
     let id = (obj._id ? obj._id : obj);
 
     if (
-      (obj.tries) &&
-      (this._factory.deadletter_queue ()) &&
-      (this._factory.max_ko ()) &&
-      (obj.tries > this._factory.max_ko ())
+      (obj.tries) &&                            // only if we got tries
+      (this._factory.deadletter_queue ()) &&    // AND the factory has a deadletter queue
+      (this._factory.max_ko ()) &&              // AND thee's a max ko attempts 
+      (obj.tries > this._factory.max_ko ()) &&  // AND we got enough tries
+      (this.name () != '__deadletter__')        // and this queue is not deadletter already
     ) {
       debug ('%s: too many retries (%d), moving to deadletter', obj._id, obj.tries);
       this._move_to_deadletter (obj, cb);
-      // TODO add from-what-queue to deadletter elements
     }
     else {
       this.rollback (id, next_t, (err, res) => {
@@ -710,15 +710,23 @@ class Queue {
   /////////////////////////////////////////////
   _move_to_deadletter (obj, cb) {
     // commit and move to deadletter
-    // ALSO NOT IN deadletter queue (to void loop)
     // commit element in origin queue, push in deadletter afterwards
+    const opts = {
+      hdrs: _.clone (obj.hdrs || {})
+    };
+
+    // add some extra x-dl-* headers
+    opts.hdrs['x-dl-from-queue'] = this.name ();
+    opts.hdrs['x-dl-t'] = new Date().toISOString ();
+    opts.hdrs['x-dl-tries'] = obj.tries;
+
     this.commit (obj._id, err => {
       if (err) {
         debug ('while committing %s prior to moving to deadletter: %j', obj._id, err);
         return cb (err);
       }
 
-      this._factory.deadletter_queue ().push (obj.payload, (err, res) => {
+      this._factory.deadletter_queue ().push (obj.payload, opts, (err, res) => {
         if (err) {
           debug ('while moving %s to deadletter: %j', obj._id, err);
           return cb (err, 'deadletter');

package/TODO

@@ -1,5 +1,6 @@
 bugs
 -------------------------------------------------------------
+* deadlettering on all backend but mongo-pipeline does not preserve hdrs
 
 prio 1
 -------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keuss",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "keywords": [
     "queue",
     "persistent",

package/test/backends_deadletter.js

@@ -111,6 +111,8 @@ function release_mq_factory (q, factory, cb) {
         pl: 'twetrwte'
       };
 
+      const hdrs = {aaa: 'qw', bbb: '666'};
+
       async.waterfall ([
         cb => get_mq_factory (MQ, factory_opts, cb),
         (factory, cb) => {
@@ -120,7 +122,7 @@ function release_mq_factory (q, factory, cb) {
 
           async.race ([
             cb => async.series([
-              cb => q.push (pl, cb),
+              cb => q.push (pl, {hdrs}, cb),
               cb => pop (q, stage, cb),
               cb => reject (q, stage, (err) => {tries++;cb()}),
               cb => pop (q, stage, cb),
@@ -139,6 +141,13 @@ function release_mq_factory (q, factory, cb) {
             }),
             cb => factory.deadletter_queue().pop('c2', (err, res) => {
               res.payload.should.eql (pl);
+              res.hdrs.should.match ({
+                aaa: "qw",
+                bbb: "666",
+                'x-dl-from-queue': "test_queue_deadletter",
+                'x-dl-t': /.+/,
+                'x-dl-tries': 4
+              });
               tries.should.equal (5);
               cb (err);
             })