Merge pull request #49 from dimichgh/master

Fixed unit tests, port of null exception during startup, compile errors

Author: zhuchenwang

lib/index.js

@@ -184,12 +184,17 @@ Cluster.prototype.listen = function(createApp, cb) {
                 process.exit(-1);
             }
         });
-        server.listen(port[index], host, function() { //'listening' listener
-            exitIfBusyPort(host, port, index-1, function(){
-                server.close();
-                cb();
-            })
-        });
+        if (require('cluster').isMaster) {
+            server.listen(port[index], host, function() { //'listening' listener
+                exitIfBusyPort(host, port, index-1, function(){
+                    server.close();
+                    cb();
+                })
+            });
+        }
+        else {
+            process.nextTick(cb);
+        }
     }
 
     return self;

lib/process.js

@@ -582,9 +582,9 @@ Process.prototype.listen = function() {
         var recycle = setInterval(function() {
 
                 var uptime = process.uptime();
-                if(totalConns > connThreshold || uptime >= uptimeThreshod) {
+                if(totalConns > connThreshold || uptime >= uptimeThreshold) {
 
-                    log('[cluster2] exit because of connThreshold:' + connThreshold + ':' + totalConns + '; or uptime:' + uptime + ' has exceeded:' + uptimeThreshod);
+                    log('[cluster2] exit because of connThreshold:' + connThreshold + ':' + totalConns + '; or uptime:' + uptime + ' has exceeded:' + uptimeThreshold);
                     clearInterval(recycle);
 
                     //wait for master's order

package.json

@@ -5,7 +5,7 @@
         "email": "subbu@ebaysf.com"
     }],
     "name": "cluster2",
-    "version": "0.4.19",
+    "version": "0.4.20",
     "repository": {
         "type": "git",
         "url": "https://github.com/ql-io/cluster2"

test/cluster-test.js

@@ -282,7 +282,9 @@ module.exports = {
                 });
             }
             // Send shutdown while requests are in-flight
-            shutdown(emitter);
+            setTimeout(function() {
+                shutdown(emitter);
+            }, 10);
         });
 
         emitter.on('start failure', function (error) {