Skip to content

Commit

Permalink
Drop default support for Architect module inclusion (use a bootstrapp…
Browse files Browse the repository at this point in the history
…er instead). Return created jobs.
  • Loading branch information
JoshuaGross committed Mar 4, 2013
1 parent 2647f14 commit 9208429
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 22 deletions.
25 changes: 4 additions & 21 deletions lib/job.js
Expand Up @@ -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() {
Expand All @@ -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;
}

Expand Down Expand Up @@ -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]) {
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion 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": {
Expand Down

0 comments on commit 9208429

Please sign in to comment.