From 9208429ba35ecda9939a4d851b8d144ed43950df Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Mon, 4 Mar 2013 00:41:36 -0600 Subject: [PATCH] Drop default support for Architect module inclusion (use a bootstrapper instead). Return created jobs. --- lib/job.js | 25 ++++--------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/lib/job.js b/lib/job.js index c85a8ba..e38936b 100644 --- a/lib/job.js +++ b/lib/job.js @@ -23,21 +23,14 @@ var redis = require('redis') , options = {} , jobsKue; -// Register with Architect -// If you are not using Job through Architect, you must call startJobsRunner manually -module.exports = function setup (options, imports, register) { - register(null, { job: module.exports }); - module.exports.startJobsRunner(options); -}; - var spawnRunner = function () {}; var dead = false; -module.exports.startJobsRunner = function (_options) { +module.exports.init = function (_options) { options = _options; options = options || {}; options.kue = options.kue || {}; - var redisOptions = (options.redis ? (options.redis[process.env.NODE_ENV] || options.redis) : null) || {host: '127.0.0.1', port: '6379'}; + var redisOptions = options.redis || {host: '127.0.0.1', port: '6379'}; var kue = require('kue'); kue.redis.createClient = function() { @@ -47,7 +40,7 @@ module.exports.startJobsRunner = function (_options) { }; jobsKue = kue.createQueue(); - if (process.env.IN_JOBS_RUNNER || (options && options.stub)) { + if (process.env.IN_JOBS_RUNNER) { return; } @@ -91,16 +84,6 @@ module.exports.startJobsRunner = function (_options) { }); }); - // Enforce that jobs runner in only run in certain environments - if (options && options.jobsRunnerConditions) { - for (var param in options.jobsRunnerConditions) { - var value = options.jobsRunnerConditions[param]; - if (eval(param) !== value) { - return; - } - } - } - spawnRunner = function (moduleName, jobName, methodName, callback) { var runnerIndex = moduleName; if (!runners[runnerIndex]) { @@ -189,7 +172,7 @@ module.exports.addHelper = function (helper) { } var args = configArguments.splice(2); - jobsKue.create(jobName, { title: jobName, args: args }) + return jobsKue.create(jobName, { title: jobName, args: args }) .delay(configArguments[0]) .priority(configArguments[1]) .save(); diff --git a/package.json b/package.json index 4743b1d..4286419 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "job", - "version": "1.4.5", + "version": "1.4.6", "description": "Job is a module that allows other modules to expose delayed jobs. For example, instead of mailer.sendRegistrationEmail, you can do mailer.delay.sendRegistrationEmail.", "main": "./lib/job.js", "plugin": {