rethinkdb-job-queue - npm Package Compare versions

Comparing version 2.3.0 to 2.3.1

dist/queue-process.js

@@ -7,3 +7,2 @@ 'use strict';
 var is = require('./is');
-var dbReview = require('./db-review');
 var queueGetNextJob = require('./queue-get-next-job');
@@ -209,3 +208,3 @@ var jobCompleted = require('./job-completed');
     }
-    return dbReview.runOnce(q);
+    return q.review();
   }).then(function () {
@@ -212,0 +211,0 @@ setImmediate(jobTick, q);

dist/queue.js

@@ -72,2 +72,13 @@ 'use strict';
   _createClass(Queue, [{
+    key: '_raiseQueueError',
+    value: function _raiseQueueError(name) {
+      var self = this;
+      return function raiseQueueErrorInternal(errObj) {
+        var message = 'Event: ' + name + ' error';
+        logger('Event: ' + message, self.id, errObj);
+        self.emit(enums.status.error, self.id, errObj);
+        return Promise.reject(errObj);
+      };
+    }
+  }, {
     key: 'createJob',
@@ -87,7 +98,3 @@ value: function createJob(jobData) {
         return queueAddJob(_this2, job);
-      }).catch(function (err) {
-        logger('Event: addJob error', _this2.id, err);
-        _this2.emit(enums.status.error, _this2.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('addJob'));
     }
@@ -102,7 +109,3 @@ }, {
         return queueGetJob(_this3, jobOrId);
-      }).catch(function (err) {
-        logger('Event: getJob error', _this3.id, err);
-        _this3.emit(enums.status.error, _this3.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('getJob'));
     }
@@ -117,7 +120,3 @@ }, {
         return queueFindJob(_this4, predicate, raw);
-      }).catch(function (err) {
-        logger('Event: findJob error', _this4.id, err);
-        _this4.emit(enums.status.error, _this4.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('findJob'));
     }
@@ -132,7 +131,3 @@ }, {
         return queueFindJobByName(_this5, name, raw);
-      }).catch(function (err) {
-        logger('Event: findJobByName error', _this5.id, err);
-        _this5.emit(enums.status.error, _this5.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('findJobByName'));
     }
@@ -149,7 +144,3 @@ }, {
         return namedJobs.length > 0;
-      }).catch(function (err) {
-        logger('Event: containsJobByName error', _this6.id, err);
-        _this6.emit(enums.status.error, _this6.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('containsJobByName'));
     }
@@ -164,7 +155,3 @@ }, {
         return queueCancelJob(_this7, jobOrId, reason);
-      }).catch(function (err) {
-        logger('Event: cancelJob error', _this7.id, err);
-        _this7.emit(enums.status.error, _this7.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('cancelJob'));
     }
@@ -179,7 +166,3 @@ }, {
         return queueReanimateJob(_this8, jobOrId, dateEnable);
-      }).catch(function (err) {
-        logger('Event: reanimateJob error', _this8.id, err);
-        _this8.emit(enums.status.error, _this8.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('reanimateJob'));
     }
@@ -194,7 +177,3 @@ }, {
         return queueRemoveJob(_this9, jobOrId);
-      }).catch(function (err) {
-        logger('Event: removeJob error', _this9.id, err);
-        _this9.emit(enums.status.error, _this9.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('removeJob'));
     }
@@ -209,7 +188,3 @@ }, {
         return queueProcess.addHandler(_this10, handler);
-      }).catch(function (err) {
-        logger('Event: process error', _this10.id, err);
-        _this10.emit(enums.status.error, _this10.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('process'));
     }
@@ -224,7 +199,3 @@ }, {
         return dbReview.runOnce(_this11);
-      }).catch(function (err) {
-        logger('Event: review error', _this11.id, err);
-        _this11.emit(enums.status.error, _this11.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('review'));
     }
@@ -239,7 +210,3 @@ }, {
         return queueSummary(_this12);
-      }).catch(function (err) {
-        logger('Event: summary error', _this12.id, err);
-        _this12.emit(enums.status.error, _this12.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('summary'));
     }
@@ -260,7 +227,3 @@ }, {
         return queueInterruption.pause(_this13, global);
-      }).catch(function (err) {
-        logger('Event: pause error', _this13.id, err);
-        _this13.emit(enums.status.error, _this13.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('pause'));
     }
@@ -275,7 +238,3 @@ }, {
         return queueInterruption.resume(_this14, global);
-      }).catch(function (err) {
-        logger('Event: resume error', _this14.id, err);
-        _this14.emit(enums.status.error, _this14.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('resume'));
     }
@@ -290,7 +249,3 @@ }, {
         return queueReset(_this15);
-      }).catch(function (err) {
-        logger('Event: reset error', _this15.id, err);
-        _this15.emit(enums.status.error, _this15.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('reset'));
     }
@@ -305,7 +260,3 @@ }, {
         return queueDb.drain(_this16);
-      }).catch(function (err) {
-        logger('Event: stop error', _this16.id, err);
-        _this16.emit(enums.status.error, _this16.id, err);
-        return Promise.reject(err);
-      });
+      }).catch(this._raiseQueueError('stop'));
     }
@@ -315,10 +266,4 @@ }, {
     value: function drop() {
-      var _this17 = this;
-
       logger('drop');
-      return queueDrop(this).catch(function (err) {
-        logger('Event: drop error', _this17.id, err);
-        _this17.emit(enums.status.error, _this17.id, err);
-        return Promise.reject(err);
-      });
+      return queueDrop(this).catch(this._raiseQueueError('drop'));
     }
@@ -398,3 +343,3 @@ }, {
         var err = new Error(enums.message.concurrencyInvalid);
-        logger('Event: concurrency error', this.id, err);
+        logger('concurrency', this.id, err);
         this.emit(enums.status.error, this.id, err);
@@ -401,0 +346,0 @@ return;

package.json

 {
   "name": "rethinkdb-job-queue",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "A persistent job or task queue backed by RethinkDB.",
@@ -59,3 +59,3 @@ "main": "index.js",
     "debug": "^2.6.0",
-    "rethinkdbdash": "^2.3.27",
+    "rethinkdbdash": "^2.3.28",
     "serialize-error": "^2.1.0",
@@ -68,8 +68,8 @@ "uuid": "^3.0.1"
     "istanbul": "0.4.5",
-    "npm-check-updates": "^2.8.10",
+    "npm-check-updates": "^2.10.2",
     "proxyquire": "^1.7.11",
     "standard": "^8.6.0",
     "tap-spec": "^4.1.1",
-    "tap": "^10.0.2"
+    "tap": "^10.1.0"
   }
 }

tests/queue-drop.spec.js

@@ -7,2 +7,3 @@ const test = require('tap').test
 const Queue = require('../src/queue')
+const simulateJobProcessing = require('./test-utils').simulateJobProcessing
 const tOpts = require('./test-options')
@@ -57,9 +58,2 @@ const rethinkdbdash = require('rethinkdbdash')
 
-      function simulateJobProcessing () {
-        q._running = 1
-        setTimeout(function setRunningToZero () {
-          q._running = 0
-        }, 500)
-      }
-
       return q.reset().then((resetResult) => {
@@ -71,3 +65,3 @@ t.ok(is.integer(resetResult), 'Queue reset')
         eventHandlers.add(t, q, state)
-        simulateJobProcessing()
+        simulateJobProcessing(q)
         return queueDrop(q)
@@ -74,0 +68,0 @@ }).then((removeResult) => {

tests/queue-stop.spec.js

@@ -9,2 +9,3 @@ const test = require('tap').test
 const Queue = require('../src/queue')
+const simulateJobProcessing = require('./test-utils').simulateJobProcessing
 const tOpts = require('./test-options')
@@ -51,9 +52,2 @@ const eventHandlers = require('./test-event-handlers')
 
-      function simulateJobProcessing () {
-        q._running = 1
-        setTimeout(function setRunningToZero () {
-          q._running = 0
-        }, 500)
-      }
-
       return q.reset().then((resetResult) => {
@@ -71,3 +65,3 @@ t.ok(is.integer(resetResult), 'Queue reset')
         t.comment('queue-stop: Stop with Drain')
-        simulateJobProcessing()
+        simulateJobProcessing(q)
         return queueStop(q)
@@ -98,3 +92,3 @@ }).then((stopped) => {
         t.notOk(q.paused, 'Queue is not paused')
-        simulateJobProcessing()
+        simulateJobProcessing(q)
         return queueStop(q)
@@ -101,0 +95,0 @@ }).then((stopped2) => {

No alert changes

Improved metrics

Number of package files

99

increased by2.06%

Worsened metrics

Total package byte prevSize

564980

decreased by-0.33%

Lines of code

7822

decreased by-0.75%

Dependency changes

• Updatedrethinkdbdash@^2.3.28