some improvments

Author: Amoki

lib/helpers/hydrater.js

@@ -54,7 +54,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
               if(err) {
                 err = new restify.BadGatewayError('Error when downloading file ' + task.file_path + ': ' + err);
               }
-              cb(err, res.text);
+              cb(err, res && res.text);
             });
         }
         else {
@@ -65,7 +65,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
         if(res) {
           fs.writeFile(path, res, cb);
         }
-        else{
+        else {
           cb();
         }
       },
@@ -81,15 +81,14 @@ module.exports = function(hydraterFunction, logger, errLogger) {
         var cleaner = function(err, changes) {
           if(!cleaner.called) {
             cleaner.called = true;
-            child.kill('SIGKILL');
             cb(err, changes);
           }
           clearTimeout(timeout);
         };
         cleaner.called = false;
 
         child.on('error', function(exitCode) {
-          cleaner(new HydrationError("Wild error appeared during spwaning child. Exit code:" + exitCode));
+          cleaner(new HydrationError("Wild error appeared while spawning child. Exit code:" + exitCode));
         });
 
         child.stderr.on('readable', function() {
@@ -108,7 +107,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
 
         child.on('exit', function(errCode) {
           if(errCode !== 0) {
-            cleaner(new HydrationError(["Child exiting with err code: " + errCode, stdout, stderr]));
+            cleaner(new HydrationError("Child exiting with err code: " + errCode + stdout + stderr));
           }
         });
 
@@ -130,15 +129,16 @@ module.exports = function(hydraterFunction, logger, errLogger) {
         });
 
         child.on('message', function(res) {
+          var err = res.err
           // If the function replied with an "HydrationError", we'll wrap this in a nicely formatted document
           // and stop the error from bubbling up.
-          if(res.err && res.err._hydrationError === true) {
+          if(err && err._hydrationError) {
             res.changes = {};
             res.changes.hydration_errored = true;
             res.changes.hydration_error = res.err.message;
-            res.err = null;
+            err = null;
           }
-          cleaner(res.err, res.changes);
+          cleaner(err, res.changes);
 
         });
 
@@ -147,6 +147,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
             var changes = {};
             changes.hydration_errored = true;
             changes.hydration_error = "Task took too long.";
+            child.kill('SIGKILL');
             cleaner(null, changes);
           }
         }, process.env.TIMEOUT || 60 * 1000);

test/errors.js

@@ -99,7 +99,6 @@ describe('Errors', function() {
     it('should be handled gracefully while hydrating', function(done) {
       var fakeApi = require('./helpers/fake-api.js')();
       fakeApi.patch('/result', function(req, res, next) {
-        //should
         res.send(204);
         next();
 

test/helpers/fake-api.js

@@ -10,7 +10,7 @@ module.exports = function() {
   fakeApi.use(restify.acceptParser(fakeApi.acceptable));
 
   fakeApi.get('/afile', function(req, res, next) {
-    fs.createReadStream(__filename, {encoding: 'utf8'}).pipe(res);
+    fs.createReadStream(__filename).pipe(res);
     next();
   });
   return fakeApi;

test/helpers/hydrater.js

@@ -90,7 +90,7 @@ describe("hydrate()", function() {
       hydrate(task, function(err, changes) {
         changes.should.have.property('hydration_errored', true);
         process.env.TIMEOUT =  60 * 1000;
-        done();
+        done(err);
       });
     });
   });