Stop running the forced shutdown timer when exiting.

itteco · Jul 13, 2017 · 11b433f · 11b433f
1 parent 1b95d11
commit 11b433f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/graceful-cluster.js b/lib/graceful-cluster.js
@@ -42,11 +42,12 @@ GracefulCluster.start = function(options) {
 
     if (cluster.isMaster) {
 
-        var sigkill = false;
+        var currentRestartingPid = null;
         var currentWorkersCount = 0;
         var listeningWorkersCount = 0;
         var restartQueue = [];
-        var currentRestartingPid = null;
+        var shutdownTimer = null;
+        var sigkill = false;
 
         // Prevent killing all workers at same time when restarting.
         function checkRestartQueue() {
@@ -95,6 +96,7 @@ GracefulCluster.start = function(options) {
         function checkIfNoWorkersAndExit() {
             if (!currentWorkersCount) {
                 log('Cluster graceful shutdown: done.');
+                if (shutdownTimer) clearTimeout(shutdownTimer);
                 exitFunction();
             } else {
                 log('Cluster graceful shutdown: wait ' + currentWorkersCount + ' worker' + (currentWorkersCount > 1 ? 's' : '') + '.');
@@ -104,6 +106,7 @@ GracefulCluster.start = function(options) {
         function startShutdown() {
 
             if (disableGraceful) {
+                if (shutdownTimer) clearTimeout(shutdownTimer);
                 exitFunction();
                 return;
             }
@@ -116,7 +119,7 @@ GracefulCluster.start = function(options) {
             }
 
             // Shutdown timeout.
-            setTimeout(function() {
+            shutdownTimer = setTimeout(function() {
                 log('Cluster graceful shutdown: timeout, force exit.');
                 exitFunction();
             }, shutdownTimeout);