merge from master to fix tests

Author: asilvas

.travis.yml

@@ -1,4 +1,6 @@
 language: node_js
 node_js:
    - "0.10"
+   - "0.12"
+   - "iojs"
 

cluster-service.js

@@ -74,7 +74,7 @@ if (
   // load the worker if not already loaded
   // async, in case worker loads cluster-service, we need to return before
   // it's avail
-  setTimeout(function() {
+  setImmediate(function() {
     cluster.worker.module = require(process.env.worker);
     if (global.cservice.locals.workerReady === undefined
       && process.env.ready.toString() === "false") {
@@ -84,7 +84,7 @@ if (
         exports.workerReady(); // NOW we're ready
       });
     }
-  }, 10);
+  });
 
   // start worker monitor to establish two-way relationship with master
   workers.monitor();

lib/commands/restart.js

@@ -67,15 +67,7 @@ module.exports.more = function(cb) {
 
 function getTask(evt, worker, options, explicitRestart) {
   return function(cb) {
-    // kill new worker if takes too long
-    var newKiller = null;
-    var newWorker = null;
-    var exitListener = function() {
-      if (newKiller) {
-        clearTimeout(newKiller);
-      }
-    };
-    var w;
+    var pendingWorker = null;
 
     if (worker.cservice.restart === false && explicitRestart === false) {
       cservice.log(
@@ -85,42 +77,44 @@ function getTask(evt, worker, options, explicitRestart) {
       return;
     }
 
+    // kill new worker if takes too long
+    var newWorkerTimeout = null;
+    var isNewWorkerTerminated = false;
     if (options.timeout > 0) { // start timeout if specified
-      newKiller = setTimeout(function() {
-        w = newWorker;
-        newWorker = null;
-        if (w) {
-          w.removeListener("exit", exitListener); // remove temp listener
-          w.kill("SIGKILL"); // go get'em, killer
+      newWorkerTimeout = setTimeout(function() {
+        if (pendingWorker) {
+          isNewWorkerTerminated = true;
+          pendingWorker.on('exit', function () {
+            cb("timed out");
+          });
+          pendingWorker.kill("SIGKILL"); // go get'em, killer
         }
-        cb("timed out");
       }, options.timeout);
     }
 
     // lets start new worker
-    newWorker = evt.service.newWorker(worker.cservice, function(err, newWorker){
-      var killer;
-      newWorker.removeListener("exit", exitListener); // remove temp listener
-      newWorker = null;
-      if (newKiller) { // timeout no longer needed
-        clearTimeout(newKiller);
+    pendingWorker = evt.service.newWorker(worker.cservice, function(err) {
+      pendingWorker = null;
+      if (newWorkerTimeout) { // timeout no longer needed
+        clearTimeout(newWorkerTimeout);
       }
+      if (isNewWorkerTerminated) return;
 
       // ok, lets stop old worker
-      killer = null;
+      var oldWorkerTimeout = null;
       if (options.timeout > 0) { // start timeout if specified
-        killer = setTimeout(function() {
+        oldWorkerTimeout = setTimeout(function() {
           worker.kill("SIGKILL"); // go get'em, killer
         }, options.timeout);
       }
 
       worker.on("exit", function() {
-        if (killer) {
-          clearTimeout(killer);
+        if (oldWorkerTimeout) {
+          clearTimeout(oldWorkerTimeout);
         }
 
         // exit complete, fire callback
-        setTimeout(cb, 100); // slight delay in case other events are piled up
+        setImmediate(cb); // slight delay in case other events are piled up
       });
 
       require("../workers").exitGracefully(worker);

lib/commands/shutdown.js

@@ -28,29 +28,22 @@ module.exports = function(evt, cb, cmd, options) {
     exiting = true;
     workersToKill++;
 
-    worker.process.on(
-      "exit",
-      getExitHandler(
-        evt
-        , worker
-        , options.timeout > 0
-          ? setTimeout(getKiller(worker), options.timeout)
-          : null
-        , function() {
-          workersToKill--;
-          if (workersToKill === 0) {
-            // no workers remain
-            if (evt.service.workers.length === 0) {
-              evt.locals.reason = "kill";
-              cservice.log("All workers shutdown. Exiting...".warn);
-              evt.service.stop(options.timeout, cb);
-            } else {
-              cb(null, "Worker shutdown"); // DONE
-            }
-          }
+    var killTimeout = options.timeout > 0
+      ? setTimeout(getKiller(worker), options.timeout)
+      : null;
+    worker.on("exit", getExitHandler(evt, worker, killTimeout, function() {
+      workersToKill--;
+      if (workersToKill === 0) {
+        // no workers remain
+        if (evt.service.workers.length === 0) {
+          evt.locals.reason = "kill";
+          cservice.log("All workers shutdown. Exiting...".warn);
+          evt.service.stop(options.timeout, cb);
+        } else {
+          cb(null, "Worker shutdown"); // DONE
         }
-      )
-    );
+      }
+    }));
 
     require("../workers").exitGracefully(worker);
   });
@@ -104,9 +97,8 @@ function getExitHandler(evt, worker, killer, cb) {
   return function() {
     if (killer) {
       clearTimeout(killer);
-      killer = null;
     }
 
     cb();
   };
-}
+}

lib/commands/start.js

@@ -64,38 +64,35 @@ module.exports.more = function(cb) {
 
 function getTask(evt, options) {
   return function(cb) {
-    // kill new worker if takes too long
-    var newKiller = null;
-    var newWorker;
-    var exitListener = function() {
-      if (newKiller) {
-        clearTimeout(newKiller);
-      }
-    };
+    var pendingWorker;
 
+    // kill new worker if takes too long
+    var startTimeout = null;
+    var isWorkerTerminated = false;
     if (options.timeout > 0) { // start timeout if specified
-      newKiller = setTimeout(function() {
-        if (!newWorker)
+      startTimeout = setTimeout(function() {
+        if (!pendingWorker)
           return;
-        newWorker.removeListener("exit", exitListener); // remove temp listener
-        newWorker.kill("SIGKILL"); // go get'em, killer
-        cb("timed out");
+        isWorkerTerminated = true;
+        pendingWorker.on('exit', function () {
+          cb("timed out");
+        });
+        pendingWorker.kill("SIGKILL"); // go get'em, killer
       }, options.timeout);
-      newKiller.unref();
+      startTimeout.unref();
     }
 
     // lets start new worker
-    newWorker = evt.service.newWorker(options, function(err, newWorker) {
-      if (newWorker) { // won't exist if failure
-        newWorker.removeListener("exit", exitListener); // remove temp listener
-      }
-      if (newKiller) { // timeout no longer needed
-        clearTimeout(newKiller);
-        newKiller = null;
-      }
+    pendingWorker = evt.service.newWorker(options, function(err) {
+      pendingWorker = null;
 
-      cb(err);
+      if (startTimeout) { // timeout no longer needed
+        clearTimeout(startTimeout);
+      }
 
+      if (!isWorkerTerminated) {
+        cb(err);
+      }
     });
   };
 }

lib/commands/upgrade.js

@@ -77,52 +77,50 @@ module.exports.more = function(cb) {
 function getTask(evt, worker, options) {
   return function(cb) {
 
-    // kill new worker if takes too long
-    var newKiller = null;
-    var newWorker;
-    var exitListener = function() {
-      if (newKiller) {
-        clearTimeout(newKiller);
-      }
-    };
-    var killer;
+    var pendingWorker;
 
+    // kill new worker if takes too long
+    var newWorkerTimeout = null;
+    var isNewWorkerTerminated = false;
     if (options.timeout > 0) { // start timeout if specified
-      newKiller = setTimeout(function() {
-        newWorker.removeListener("exit", exitListener);// remove temp listener
-        newWorker.kill("SIGKILL"); // go get'em, killer
-        cb("timed out");
+      newWorkerTimeout = setTimeout(function() {
+        if (!pendingWorker) return;
+
+        isNewWorkerTerminated = true;
+        pendingWorker.on('exit', function () {
+          cb("timed out");
+        });
+        pendingWorker.kill("SIGKILL"); // go get'em, killer
       }, options.timeout);
     }
 
     // lets start new worker
-    newWorker = evt.service.newWorker(options, function(err, newWorker) {
-      if (newWorker) { // won't exist if failure
-        newWorker.removeListener("exit", exitListener); // remove temp listener
-      }
-      if (newKiller) { // timeout no longer needed
-        clearTimeout(newKiller);
+    pendingWorker = evt.service.newWorker(options, function (err) {
+      pendingWorker = null;
+      if (newWorkerTimeout) { // timeout no longer needed
+        clearTimeout(newWorkerTimeout);
       }
+
       if (err) {
         cb(err);
         return;
       }
 
       // ok, lets stop old worker
-      killer = null;
+      var oldWorkerTimeout = null;
       if (options.timeout > 0) { // start timeout if specified
-        killer = setTimeout(function() {
+        oldWorkerTimeout = setTimeout(function() {
           worker.kill("SIGKILL"); // go get'em, killer
         }, options.timeout);
       }
 
       worker.on("exit", function() {
-        if (killer) {
-          clearTimeout(killer);
+        if (oldWorkerTimeout) {
+          clearTimeout(oldWorkerTimeout);
         }
 
         // exit complete, fire callback
-        setTimeout(cb, 250); // slight delay in case other events are piled up
+        setImmediate(cb); // slight delay in case other events are piled up
       });
 
       require("../workers").exitGracefully(worker);

lib/net-servers.js

@@ -108,20 +108,7 @@ function netServersClose(cb) {
 
 function createWaitForCloseTask(server) {
   return function(cb) {
-    var tmpRequestCb = function(req, res) {
-      if (res.headersSent === false) {
-        // required to gracefully close connections on pending requests
-        // this logic is typically only hit under VERY high load
-        res.setHeader("Connection", "close");
-      }
-    };
-    var tmpCloseCb = function() {
-      server.removeListener("close", tmpCloseCb);
-      //server.removeListener("request", tmpRequestCb);
-      cb(null, true);
-    };
-    server.on("close", tmpCloseCb);
-    //server.on("request", tmpRequestCb);
+    server.once("close", function() { cb(null, true); });
     server.close();
   };
 }

lib/stop.js

@@ -10,18 +10,18 @@ function stop(timeout, cb) {
 
   if (cservice.workers.length > 0) { // issue shutdown
     cservice.trigger("shutdown", function() {
-      if (cb) cb(null, "Shutting down...");
-      require("./http-server").close();
-      if (cservice.options.cli === true) {
-        process.exit(0);
-      }
+      handleWorkersExited(cb);
     }, "all", timeout);
   } else { // gracefully shutdown
-    if (cb) cb(null, "Shutting down...");
-    require("./http-server").close();
-    cservice.locals.state = 0;
-    if (cservice.options.cli === true) {
-      process.exit(0);
-    }
+    handleWorkersExited(cb);
+  }
+}
+
+function handleWorkersExited(cb) {
+  if (cb) cb(null, "Shutting down...");
+  require("./http-server").close();
+  cservice.locals.state = 0;
+  if (cservice.options.cli === true) {
+    process.exit(1);
   }
 }

lib/workers.js

@@ -23,7 +23,7 @@ function get() {
     }
   }
 
-  workers.send=send;
+  workers.send = send;
 
   return workers;
 }
@@ -103,7 +103,7 @@ function demote() {
  */
 function send(){
   this.forEach(function(worker){
-    //worker.send.apply(worker, [].slice.apply(arguments));
+    worker.send.apply(worker, [].slice.apply(arguments));
   });
 }
 

test/start-restart.js

@@ -80,11 +80,14 @@ if(cservice.isWorker){
     });
 
     it('Stop workers', function(done) {
-      cservice.stop(30000, function() {
+      cservice.stop(30000, function(err, msg) {
+        assert.ok(!err, 'Error: ' + err);
         assert.equal(
           cservice.workers.length,
           0,
-          "0 workers expected, but " + cservice.workers.length + " found"
+          "0 workers expected, but "
+          + cservice.workers.length
+          + " found. Message: " + msg
         );
         done();
       });