Fixes #2047. Fill workers array immediately after fork

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/cluster.js b/lib/cluster.js
index 01547d6089..807ce8044a 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -102,7 +102,7 @@ function handleWorkerMessage(worker, message) {
   switch (message.cmd) {
     case 'online':
       console.log("Worker " + worker.pid + " online");
-      workers[message._workerId] = worker;
+      worker.online = true;
       break;
 
     case 'queryServer':
@@ -158,6 +158,8 @@ cluster.fork = function() {
 
   var worker = fork(workerFilename, workerArgs, { env: envCopy });
 
+  workers[id] = worker;
+
   worker.on('message', function(message) {
     handleWorkerMessage(worker, message);
   });
@@ -169,7 +171,7 @@ cluster.fork = function() {
   });
 
   return worker;
-}
+};
 
 
 // Internal function. Called from src/node.js when worker process starts.