rethinkdb-job-queue - npm Package Compare versions

Comparing version 2.0.2 to 2.1.0

dist/db-assert-database.js

@@ -11,3 +11,3 @@ 'use strict';
       return q.r.branch(databaseExists, { dbs_created: 0 }, q.r.dbCreate(q.db));
-    }).run();
+    }).run(q.queryRunOptions);
   }).then(function (dbCreateResult) {
@@ -14,0 +14,0 @@ dbCreateResult.dbs_created > 0 ? logger('Database created: ' + q.db) : logger('Database exists: ' + q.db);

dist/db-assert-index.js

@@ -11,3 +11,3 @@ 'use strict';
   return Promise.resolve().then(function () {
-    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run();
+    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run(q.queryRunOptions);
   }).then(function (exists) {
@@ -19,3 +19,3 @@ if (exists) {
       return q.r.branch(row('status').eq(enums.status.active), row('dateEnable'), null);
-    }).run();
+    }).run(q.queryRunOptions);
   });
@@ -28,3 +28,3 @@ }
   return Promise.resolve().then(function () {
-    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run();
+    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run(q.queryRunOptions);
   }).then(function (exists) {
@@ -36,3 +36,3 @@ if (exists) {
       return q.r.branch(row('status').eq(enums.status.waiting), [row('priority'), row('dateEnable'), row('dateCreated')], row('status').eq(enums.status.failed), [row('priority'), row('dateEnable'), row('dateCreated')], null);
-    }).run();
+    }).run(q.queryRunOptions);
   });
@@ -45,3 +45,3 @@ }
   return Promise.resolve().then(function () {
-    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run();
+    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run(q.queryRunOptions);
   }).then(function (exists) {
@@ -53,3 +53,3 @@ if (exists) {
       return q.r.branch(row('status').eq(enums.status.completed), row('dateFinished'), row('status').eq(enums.status.cancelled), row('dateFinished'), row('status').eq(enums.status.terminated), row('dateFinished'), null);
-    }).run();
+    }).run(q.queryRunOptions);
   });
@@ -62,3 +62,3 @@ }
   return Promise.resolve().then(function () {
-    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run();
+    return q.r.db(q.db).table(q.name).indexList().contains(indexName).run(q.queryRunOptions);
   }).then(function (exists) {
@@ -68,3 +68,3 @@ if (exists) {
     }
-    return q.r.db(q.db).table(q.name).indexCreate(indexName).run();
+    return q.r.db(q.db).table(q.name).indexCreate(indexName).run(q.queryRunOptions);
   });
@@ -77,3 +77,3 @@ }
     logger('Waiting for index...');
-    return q.r.db(q.db).table(q.name).indexWait().run();
+    return q.r.db(q.db).table(q.name).indexWait().run(q.queryRunOptions);
   }).then(function () {
@@ -80,0 +80,0 @@ logger('Indexes ready.');

dist/db-assert-table.js

@@ -11,7 +11,7 @@ 'use strict';
       return q.r.branch(tableExists, { tables_created: 0 }, q.r.db(q.db).tableCreate(q.name));
-    }).run();
+    }).run(q.queryRunOptions);
   }).then(function (tableCreateResult) {
     tableCreateResult.tables_created > 0 ? logger('Table created: ' + q.name) : logger('Table exists: ' + q.name);
   }).then(function () {
-    return q.r.db(q.db).table(q.name).wait().run();
+    return q.r.db(q.db).table(q.name).wait().run(q.queryRunOptions);
   }).then(function () {
@@ -18,0 +18,0 @@ logger('Table ready.');

dist/db-review.js

@@ -32,3 +32,3 @@ 'use strict';
       queueId: q.id
-    }).run();
+    }).run(q.queryRunOptions);
   }).then(function (updateResult) {
@@ -42,3 +42,3 @@ logger('updateResult', updateResult);
   logger('removeFinishedJobsBasedOnTime');
-  return q.r.db(q.db).table(q.name).orderBy({ index: enums.index.indexFinishedDateFinished }).filter(q.r.row('dateFinished').add(q.r.expr(q.removeFinishedJobs).div(1000)).lt(q.r.now())).delete().run();
+  return q.r.db(q.db).table(q.name).orderBy({ index: enums.index.indexFinishedDateFinished }).filter(q.r.row('dateFinished').add(q.r.expr(q.removeFinishedJobs).div(1000)).lt(q.r.now())).delete().run(q.queryRunOptions);
 }
@@ -48,3 +48,3 @@
   logger('removeFinishedJobsBasedOnNow');
-  return q.r.db(q.db).table(q.name).orderBy({ index: enums.index.indexFinishedDateFinished }).filter(q.r.row('dateFinished').lt(q.r.now())).delete().run();
+  return q.r.db(q.db).table(q.name).orderBy({ index: enums.index.indexFinishedDateFinished }).filter(q.r.row('dateFinished').lt(q.r.now())).delete().run(q.queryRunOptions);
 }
@@ -51,0 +51,0 @@

dist/enums.js

@@ -52,2 +52,3 @@ 'use strict';
   db: 'rjqJobQueue',
+  queryRunOptions: { readMode: 'majority' },
   databaseInitDelay: 1000,
@@ -54,0 +55,0 @@ masterInterval: 310000, // 5 minutes and 10 seconds

dist/job-completed.js

@@ -30,3 +30,3 @@ 'use strict';
       queueId: job.q.id
-    }, { returnChanges: true }).run();
+    }, { returnChanges: true }).run(job.q.queryRunOptions);
   }).then(function (updateResult) {
@@ -33,0 +33,0 @@ logger('updateResult', updateResult);

dist/job-failed.js

@@ -57,3 +57,3 @@ 'use strict';
       queueId: job.q.id
-    }, { returnChanges: true }).run();
+    }, { returnChanges: true }).run(job.q.queryRunOptions);
   }).then(function (updateResult) {
@@ -60,0 +60,0 @@ logger('updateResult', updateResult);

dist/job-progress.js

@@ -24,3 +24,3 @@ 'use strict';
   return Promise.resolve().then(function () {
-    return job.q.r.db(job.q.db).table(job.q.name).get(job.id).pluck('progress').run();
+    return job.q.r.db(job.q.db).table(job.q.name).get(job.id).pluck('progress').run(job.q.queryRunOptions);
   }).then(function (pluck) {
@@ -34,3 +34,3 @@ return jobLog.createLogObject(job, pluck.progress, enums.message.jobProgress, enums.log.information);
       log: job.q.r.row('log').append(newLog)
-    }, { returnChanges: true }).run();
+    }, { returnChanges: true }).run(job.q.queryRunOptions);
   }).then(function (updateResult) {
@@ -37,0 +37,0 @@ return dbResult.toJob(job.q, updateResult);

dist/job-update.js

@@ -21,3 +21,3 @@ 'use strict';
   }).then(function (cleanJob) {
-    return job.q.r.db(job.q.db).table(job.q.name).get(job.id).update(cleanJob, { returnChanges: false }).run();
+    return job.q.r.db(job.q.db).table(job.q.name).get(job.id).update(cleanJob, { returnChanges: false }).run(job.q.queryRunOptions);
   }).then(function (updateResult) {
@@ -24,0 +24,0 @@ logger('updateResult', updateResult);

dist/queue-add-job.js

@@ -24,3 +24,3 @@ 'use strict';
     logger('cleanJobs', cleanJobs);
-    return q.r.db(q.db).table(q.name).insert(cleanJobs, { returnChanges: true }).run();
+    return q.r.db(q.db).table(q.name).insert(cleanJobs, { returnChanges: true }).run(q.queryRunOptions);
   }).then(function (saveResult) {
@@ -27,0 +27,0 @@ logger('saveResult', saveResult);

dist/queue-cancel-job.js

@@ -33,3 +33,3 @@ 'use strict';
       queueId: q.id
-    }, { returnChanges: true }).run();
+    }, { returnChanges: true }).run(q.queryRunOptions);
   }).then(function (updateResult) {
@@ -36,0 +36,0 @@ logger('updateResult', updateResult);

dist/queue-db.js

@@ -22,3 +22,3 @@ 'use strict';
     if (q.changeFeed) {
-      return q.r.db(q.db).table(q.name).changes().run().then(function (changeFeed) {
+      return q.r.db(q.db).table(q.name).changes().run(q.queryRunOptions).then(function (changeFeed) {
         q._changeFeedCursor = changeFeed;
@@ -25,0 +25,0 @@ return q._changeFeedCursor.each(function (err, change) {

dist/queue-drop.js

@@ -15,3 +15,3 @@ 'use strict';
   }).then(function () {
-    return q.r.db(q.db).tableDrop(q.name).run();
+    return q.r.db(q.db).tableDrop(q.name).run(q.queryRunOptions);
   }).then(function () {
@@ -18,0 +18,0 @@ logger('Event: dropped [' + q.id + ']');

dist/queue-find-job.js

@@ -10,3 +10,3 @@ 'use strict';
   return Promise.resolve().then(function () {
-    return q.r.db(q.db).table(q.name).filter(predicate).run();
+    return q.r.db(q.db).table(q.name).filter(predicate).run(q.queryRunOptions);
   }).then(function (jobsData) {
@@ -13,0 +13,0 @@ logger('jobsData', jobsData);

dist/queue-get-job.js

@@ -17,3 +17,3 @@ 'use strict';
 
-    return (_q$r$db$table = q.r.db(q.db).table(q.name)).getAll.apply(_q$r$db$table, _toConsumableArray(ids)).run();
+    return (_q$r$db$table = q.r.db(q.db).table(q.name)).getAll.apply(_q$r$db$table, _toConsumableArray(ids)).run(q.queryRunOptions);
   }).then(function (jobsData) {
@@ -20,0 +20,0 @@ logger('jobsData', jobsData);

dist/queue-get-next-job.js

@@ -32,3 +32,3 @@ 'use strict';
       })
-    }, { returnChanges: true }).default({}).run();
+    }, { returnChanges: true }).default({}).run(q.queryRunOptions);
   }).then(function (updateResult) {
@@ -35,0 +35,0 @@ logger('updateResult', updateResult);

dist/queue-reanimate-job.js

@@ -29,3 +29,3 @@ 'use strict';
       status: enums.status.waiting
-    }, { returnChanges: true }).run();
+    }, { returnChanges: true }).run(q.queryRunOptions);
   }).then(function (jobsResult) {
@@ -32,0 +32,0 @@ logger('jobsResult', jobsResult);

dist/queue-remove-job.js

@@ -20,3 +20,3 @@ 'use strict';
       jobIds: jobIds,
-      removeResult: (_q$r$db$table = q.r.db(q.db).table(q.name)).getAll.apply(_q$r$db$table, _toConsumableArray(jobIds)).delete().run()
+      removeResult: (_q$r$db$table = q.r.db(q.db).table(q.name)).getAll.apply(_q$r$db$table, _toConsumableArray(jobIds)).delete().run(q.queryRunOptions)
     });
@@ -23,0 +23,0 @@ }).then(function (result) {

dist/queue-reset.js

@@ -11,3 +11,3 @@ 'use strict';
   return Promise.resolve().then(function () {
-    return q.r.db(q.db).table(q.name).delete().run();
+    return q.r.db(q.db).table(q.name).delete().run(q.queryRunOptions);
   }).then(function (resetResult) {
@@ -14,0 +14,0 @@ logger('resetResult', resetResult);

dist/queue-state.js

@@ -14,3 +14,3 @@ 'use strict';
       state: newState
-    }, { conflict: 'replace' }).run();
+    }, { conflict: 'replace' }).run(q.queryRunOptions);
   }).then(function (insertResult) {
@@ -17,0 +17,0 @@ logger('insertResult', insertResult);

dist/queue.js

@@ -55,2 +55,3 @@ 'use strict';
 
+    _this._queryRunOptions = options.queryRunOptions == null ? enums.options.queryRunOptions : options.queryRunOptions;
     _this._masterInterval = options.masterInterval == null ? enums.options.masterInterval : options.masterInterval;
@@ -57,0 +58,0 @@ _this._databaseInitDelay = options.databaseInitDelay == null ? enums.options.databaseInitDelay : options.databaseInitDelay;

package.json

 {
   "name": "rethinkdb-job-queue",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "A persistent job or task queue backed by RethinkDB.",
@@ -58,6 +58,6 @@ "main": "index.js",
     "bluebird": "^3.4.6",
-    "debug": "^2.3.2",
-    "rethinkdbdash": "^2.3.26",
-    "serialize-error": "^2.0.0",
-    "uuid": "^3.0.0"
+    "debug": "^2.3.3",
+    "rethinkdbdash": "^2.3.27",
+    "serialize-error": "^2.1.0",
+    "uuid": "^3.0.1"
   },
@@ -68,5 +68,5 @@ "devDependencies": {
     "istanbul": "0.4.5",
-    "npm-check-updates": "^2.8.6",
+    "npm-check-updates": "^2.8.8",
     "proxyquire": "^1.7.10",
-    "standard": "^8.5.0",
+    "standard": "^8.6.0",
     "tap-spec": "^4.1.1",
@@ -73,0 +73,0 @@ "tap": "^8.0.1"

tests/enums.spec.js

@@ -19,3 +19,3 @@ const test = require('tap').test
       t.equal(Object.keys(enums.status).length, 26, 'Enums status has correct number of keys')
-      t.equal(Object.keys(enums.options).length, 14, 'Enums options has correct number of keys')
+      t.equal(Object.keys(enums.options).length, 15, 'Enums options has correct number of keys')
       t.equal(Object.keys(enums.index).length, 4, 'Enums index has correct number of keys')
@@ -22,0 +22,0 @@ t.equal(Object.keys(enums.log).length, 3, 'Enums log has correct number of keys')

No alert changes

Improved metrics

Total package byte prevSize

546338

increased by0.13%

Lines of code

7660

increased by0.03%

Dependency changes

• Updateddebug@^2.3.3

• Updatedrethinkdbdash@^2.3.27

• Updatedserialize-error@^2.1.0

• Updateduuid@^3.0.1