Set graceful shutdown off by default

configfile.js

@@ -266,6 +266,7 @@ cfreader.ensure_enoent_timer = function () {
             })(files[i]); // END BLOCK SCOPE
         }
     }, 60 * 1000);
+    cfreader._enoent_timer.unref();
 };
 
 process.on('message', function (msg) {

haraka.js

@@ -50,10 +50,10 @@ var shutting_down = false;
         logger.lognotice(sig + ' received');
         logger.dump_and_exit(function () {
             if (server.cluster && server.cluster.isMaster) {
-                server.gracefulShutdown();
+                server.performShutdown();
             }
             else if (!server.cluster) {
-                server.gracefulShutdown();
+                server.performShutdown();
             }
         });
     });

server.js

@@ -1,6 +1,7 @@
 'use strict';
 // smtp network server
 
+// var log = require('why-is-node-running');
 var net         = require('./tls_socket');
 var conn        = require('./connection');
 var outbound    = require('./outbound');
@@ -27,6 +28,7 @@ Server.load_smtp_ini = function () {
     Server.cfg = Server.config.get('smtp.ini', {
         booleans: [
             '-main.daemonize',
+            '-main.graceful_shutdown',
         ],
     }, function () {
         Server.load_smtp_ini();
@@ -97,26 +99,33 @@ Server.gracefulRestart = function () {
     Server._graceful();
 }
 
+Server.performShutdown = function () {
+    if (Server.cfg.main.graceful_shutdown) {
+        return Server.gracefulShutdown();
+    }
+    logger.loginfo("Shutting down.");
+    process.exit(0);
+}
+
 Server.gracefulShutdown = function () {
     logger.loginfo('Shutting down listeners');
     Server.listeners.forEach(function (server) {
         server.close();
     });
     Server._graceful(function () {
+        // log();
         logger.loginfo("Failed to shutdown naturally. Exiting.");
         process.exit(0);
     });
 }
 
 Server._graceful = function (shutdown) {
-    if (!Server.cluster) {
-        if (shutdown) {
-            ['outbound', 'cfreader', 'plugins'].forEach(function (module) {
-                process.emit('message', {event: module + '.shutdown'});
-            });
-            var t = setTimeout(shutdown, Server.cfg.main.force_shutdown_timeout * 1000);
-            return t.unref();
-        }
+    if (!Server.cluster && shutdown) {
+        ['outbound', 'cfreader', 'plugins'].forEach(function (module) {
+            process.emit('message', {event: module + '.shutdown'});
+        });
+        var t = setTimeout(shutdown, Server.cfg.main.force_shutdown_timeout * 1000);
+        return t.unref();
     }
 
     if (gracefull_in_progress) {
@@ -129,10 +138,13 @@ Server._graceful = function (shutdown) {
     var disconnect_timeout = 30;
     var exit_timeout = 30;
     cluster.removeAllListeners('exit');
-    // only reload one worker at a time
-    // otherwise, we'll have a time when no connection handlers are running
+    // we reload using eachLimit where limit = num_workers - 1
+    // this kills all-but-one workers in parallel, leaving one running
+    // for new connections, and then restarts that one last worker.
     var worker_ids = Object.keys(cluster.workers);
-    async.eachSeries(worker_ids, function (id, cb) {
+    var limit = worker_ids.length - 1;
+    if (limit < 2) limit = 1;
+    async.eachLimit(worker_ids, limit, function (id, cb) {
         logger.lognotice("Killing node: " + id);
         var worker = cluster.workers[id];
         ['outbound', 'cfreader', 'plugins'].forEach(function (module) {

tls_socket.js

@@ -137,6 +137,10 @@ pluggableStream.prototype.setKeepAlive = function (bool) {
 pluggableStream.prototype.setNoDelay = function (/* true||false */) {
 };
 
+pluggableStream.prototype.unref = function () {
+    return this.targetsocket.unref();
+};
+
 pluggableStream.prototype.setTimeout = function (timeout) {
     this._timeout = timeout;
     return this.targetsocket.setTimeout(timeout);