Merge pull request #23 from AnyFetch/domains-errors

Revert "Blackmagic domains"

Author: Neamar

lib/helpers/hydrater.js

@@ -40,8 +40,6 @@ module.exports = function(hydraterFunction, logger, errLogger) {
     logger("Starting task: " + ((task.file_path) ? task.file_path : task.document.id));
 
     var path = '/tmp/AFH-' + crypto.randomBytes(20).toString('hex');
-    var domain = nodeDomain.create();
-
     async.waterfall([
       /**
        * Download the file from task.file_path, store it in a temporary file if there is file_path
@@ -76,21 +74,24 @@ module.exports = function(hydraterFunction, logger, errLogger) {
         }
       },
       function performHydration(cb) {
+        var domain = nodeDomain.create();
 
         var timeout;
         /**
          * Function to call, either on domain error, on hydration error or successful hydration.
          * Will clean the fs and dispose the domain for better performance.
          */
-        var onlyOnce = function(err, changes) {
-          if(!onlyOnce.called) {
-            onlyOnce.called = true;
+        var cleaner = function(err, changes) {
+          if(!cleaner.called) {
+            cleaner.called = true;
+            domain.exit();
+            domain.dispose();
             cb(err, changes);
           }
         };
-        onlyOnce.called = false;
+        cleaner.called = false;
 
-        domain.on('error', onlyOnce);
+        domain.on('error', cleaner);
 
         // Run in a domain to prevent memory leak on crash
         domain.run(function() {
@@ -120,17 +121,17 @@ module.exports = function(hydraterFunction, logger, errLogger) {
 
             // Wait for nexttick, to end this function and be able to properly GC it on domain.dispose().
             process.nextTick(function() {
-              onlyOnce(err, changes);
+              cleaner(err, changes);
             });
           });
         });
 
         timeout = setTimeout(function() {
-          if(!onlyOnce.called) {
+          if(!cleaner.called) {
             var changes = {};
             changes.hydration_errored = true;
             changes.hydration_error = "Task took too long.";
-            onlyOnce(null, changes);
+            cleaner(null, changes);
           }
         }, process.env.TIMEOUT || 60 * 1000);
       },
@@ -188,9 +189,6 @@ module.exports = function(hydraterFunction, logger, errLogger) {
           .end(rarity.carry([changes], cb));
       }
     ], function handleErrors(err, changes, res) {
-      domain.exit();
-      domain.dispose();
-
       if(err) {
         // When the user asked for long polling, send error
         if(task.next) {