Child processes are now terminated when the parent process dies. This means that if the main mailtrain process gets killed, there are no processes which remain running.

server/lib/builtin-zone-mta.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const config = require('config');
-const fork = require('child_process').fork;
+const fork = require('./fork').fork;
 const log = require('./log');
 const path = require('path');
 const fs = require('fs-extra')

server/lib/executor.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fork = require('child_process').fork;
+const fork = require('./fork').fork;
 const log = require('./log');
 const path = require('path');
 const bluebird = require('bluebird');

server/lib/feedcheck.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fork = require('child_process').fork;
+const fork = require('./fork').fork;
 const log = require('./log');
 const path = require('path');
 const senders = require('./senders');

server/lib/fork.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const builtinFork = require('child_process').fork;
+
+const cleanExit = () => process.exit();
+process.on('SIGINT', cleanExit); // catch ctrl-c
+process.on('SIGTERM', cleanExit); // catch kill
+
+const children = [];
+
+process.on('message', msg => {
+    if (msg === 'exit') {
+        cleanExit();
+    }
+});
+
+
+process.on('exit', function() {
+    for (const child of children) {
+        child.send('exit');
+    }
+});
+
+function fork(path, args, opts) {
+    const child = builtinFork(path, args, opts);
+
+    children.push(child);
+    return child;
+}
+
+module.exports.fork = fork;

server/lib/importer.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const knex = require('./knex');
-const fork = require('child_process').fork;
+const fork = require('./fork').fork;
 const log = require('./log');
 const path = require('path');
 const {ImportStatus, RunStatus} = require('../../shared/imports');

server/lib/senders.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fork = require('child_process').fork;
+const fork = require('./fork').fork;
 const log = require('./log');
 const path = require('path');
 const knex = require('./knex');