Merge pull request #44 from AnyFetch/opbeat-in-childs

use opbeat in childs

Author: Neamar

lib/helpers/child-process.js

@@ -9,19 +9,31 @@
  */
 
 var crypto = require('crypto');
-var async = require("async");
+var async = require('async');
 var fs = require('fs');
 var request = require('supertest');
 var url = require('url');
 var rarity = require('rarity');
 
+var logError = require('../utils').logError;
+
 var filePath;
 var path;
 
+
 process.on('message', function(task) {
   filePath = task.file_path;
   path = '/tmp/AFH-' + crypto.randomBytes(20).toString('hex');
   var hydrate = require(task.functionPath);
+
+  logError.config = task.opbeatConfig;
+
+  /* istanbul ignore next */
+  if(task.opbeatConfig && task.opbeatConfig.secretToken) {
+    var opbeat = require('opbeat');
+    logError.opbeat = opbeat(task.opbeatConfig);
+  }
+
   async.waterfall([
     /**
      * Download the file from task.file_path, store it in a temporary file if there is file_path
@@ -70,10 +82,24 @@ process.on('message', function(task) {
     }
   ],
   function(err, changes) {
-    process.send({
-      err: err,
-      changes: changes
-    });
+    if(err) {
+      var extra = JSON.parse(JSON.stringify(task));
+      extra.fromChild = true;
+      extra.changes = changes;
+      logError(err, extra);
+      process.send({
+        err: {
+          message: err.toString(),
+          _hydrationError: err._hydrationError
+        },
+        changes: changes
+      });
+    }
+    else {
+      process.send({
+        changes: changes
+      });
+    }
   });
 });
 

lib/helpers/hydrater.js

@@ -19,7 +19,7 @@ var HydrationError = lib.HydrationError;
 var logError = require('../utils').logError;
 
 
-module.exports = function(hydraterFunction, childs) {
+module.exports = function(hydraterFunction, childs, opbeatConfig) {
   /**
    * Handle a hydration task:
    * - Download the file
@@ -75,8 +75,8 @@ module.exports = function(hydraterFunction, childs) {
         };
         cleaner.called = false;
 
-        child.process.on('error', function(exitCode) {
-          cleaner(new HydrationError("Wild error appeared while spawning child. Exit code:" + exitCode));
+        child.process.on('error', function(error) {
+          cleaner(new HydrationError("Wild error appeared while spawning child. error:" + error));
         });
 
         child.process.stderr.on('readable', function() {
@@ -119,17 +119,23 @@ module.exports = function(hydraterFunction, childs) {
           document: task.document,
           changes: lib.defaultChanges(),
           options: options,
+          opbeatConfig: opbeatConfig
         });
 
         child.process.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(err && err._hydrationError) {
-            res.changes = {};
-            res.changes.hydration_errored = true;
-            res.changes.hydration_error = err.message;
-            err = null;
+          if(err) {
+            if(err._hydrationError) {
+              res.changes = {};
+              res.changes.hydration_errored = true;
+              res.changes.hydration_error = err.message;
+              err = null;
+            }
+            else {
+              err = err.message ? err.message : err;
+            }
           }
           cleaner(err, res.changes);
         });

lib/index.js

@@ -50,7 +50,7 @@ module.exports.createServer = function(config) {
 
   var childs = new Childs(concurrency, tasksPerProcess);
 
-  var hydraterHelper = require('./helpers/hydrater.js')(config.hydrater_function, childs);
+  var hydraterHelper = require('./helpers/hydrater.js')(config.hydrater_function, childs, config.opbeat);
 
   var server = restify.createServer({
     log: log

test/errors.js

@@ -114,7 +114,7 @@ describe('Errors', function() {
       fakeApi.patch('/result', function(req, res, next) {
         res.send(204);
         next();
-        if(req.params.hydration_errored && req.params.hydration_error === "hydrater errored") {
+        if(req.params.hydration_errored && req.params.hydration_error === "HydrationError: hydrater errored") {
           done();
         }
         else {

test/hydraters/errored-hydrater.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var anyfetchFileHydrater = require('../../lib/');
+var HydrationError = require('../../lib/').HydrationError;
 
 module.exports = function erroredHydrater(path, document, changes, cb) {
-  cb(new anyfetchFileHydrater.HydrationError("hydrater errored"));
+  cb(new HydrationError("hydrater errored"));
 };