Merge pull request #26 from AnyFetch/better-killing

kill with sigterm before send a sigkill

Author: Neamar

lib/helpers/child-process.js

@@ -15,10 +15,12 @@ var request = require('supertest');
 var url = require('url');
 var rarity = require('rarity');
 
+var file_path;
+var path = '/tmp/AFH-' + crypto.randomBytes(20).toString('hex');
 
 process.on('message', function(task) {
+  file_path = task.file_path;
   var hydrate = require(task.functionPath);
-  var path = '/tmp/AFH-' + crypto.randomBytes(20).toString('hex');
   async.waterfall([
     /**
      * Download the file from task.file_path, store it in a temporary file if there is file_path
@@ -70,6 +72,19 @@ process.on('message', function(task) {
       err: err,
       changes: changes
     });
+    process.disconnect();
     process.exit(0);
   });
 });
+
+
+process.on('SIGTERM', function() {
+  if(file_path) {
+    try {
+      fs.unlinkSync(path);
+    }
+    catch (err) {}
+  }
+  process.disconnect();
+  process.exit(0);
+});

lib/helpers/hydrater.js

@@ -8,7 +8,7 @@
  */
 
 var async = require('async');
-var shellFork = require('child_process').fork;
+var fork = require('child_process').fork;
 var request = require('supertest');
 var restify = require('restify');
 var url = require('url');
@@ -39,7 +39,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
 
     async.waterfall([
       function performHydration(cb) {
-        var child = shellFork(__dirname + '/child-process.js', {silent: true});
+        var child = fork(__dirname + '/child-process.js', {silent: true});
         var stderr = "";
         var stdout = "";
         var timeout;
@@ -81,7 +81,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
         });
 
         child.on('exit', function(errCode) {
-          if(errCode !== 0) {
+          if(errCode !== 0 && errCode !== 143) {
             cleaner(new HydrationError("Child exiting with err code: " + errCode + stdout + stderr));
           }
         });
@@ -110,7 +110,7 @@ module.exports = function(hydraterFunction, logger, errLogger) {
           if(err && err._hydrationError) {
             res.changes = {};
             res.changes.hydration_errored = true;
-            res.changes.hydration_error = res.err.message;
+            res.changes.hydration_error = err.message;
             err = null;
           }
           cleaner(err, res.changes);
@@ -121,8 +121,14 @@ 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);
+            errLogger('Killing task: ' + ((task.file_path) ? task.file_path : task.document.id));
+            child.kill('SIGTERM');
+            setTimeout(function() {
+              if(child.connected) {
+                child.kill('SIGKILL');
+              }
+              cleaner(null, changes);
+            }, process.env.TIMEOUT / 6 || 10 * 1000);
           }
         }, process.env.TIMEOUT || 60 * 1000);
       },