Tweaks and cleanup.

diy · Nov 14, 2012 · fd1c392 · fd1c392
1 parent 757a8e9
commit fd1c392
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/bin/index.js b/bin/index.js
@@ -2,7 +2,7 @@
 var optimist = require('optimist'),
     wizardry = require('./../lib/wizardry');
 
-var callback = function(err) {
+var stdout = function(err) {
     if (err) { console.dir(err); };
 }
 
@@ -14,5 +14,5 @@ var argv = optimist.usage('Usage: $0 [images] [task]')
     .describe('t', 'Task file used to process images.')
     .argv;
 
-wizardry([__dirname + '/' + argv.i], require('./' + argv.t), callback);
+wizardry([__dirname + '/' + argv.i], require('./' + __dirname + '/' + argv.t), stdout);
 
diff --git a/lib/wizardry.js b/lib/wizardry.js
@@ -37,7 +37,7 @@ module.exports = function (images, task, callback) {
 
     var args = [];
 
-    var cpu = task.threads ? task.threads : require('os').cpus().length;
+    var cpu = task.processes ? task.processes : require('os').cpus().length;
     _.defaults(env, {
         cpu: cpu
     });
@@ -57,13 +57,13 @@ module.exports = function (images, task, callback) {
         var args_processed = args.slice(0);
         args_processed.push(filename);
         var process = spawn('gm', args_processed);
-        process.on('exit', function(code) {callback();});
+        process.on('exit', function (code) {
+            if (code !== 0) return callback('Process ended with signal ' + code);
+            callback();
+        });
     }, env.cpu);
 
     queue.push(images);
 
-    queue.drain = function(error) {
+    queue.drain = callback;
-        if (error) callback(error);
-        else callback();
-    }
 };