Skip to content

Commit 6892536

Browse files
mscdexMylesBorins
authored andcommitted
tools: move message listener to worker objects
Moving the `message` event listener from the cluster object to each worker object allows easier backporting of the recent jslint changes since v5.x and older do not have v6.x's `worker` parameter in the cluster object's `message` event. PR-URL: #6212 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]>
1 parent b8ae1b8 commit 6892536

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

tools/jslint.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,6 @@ if (cluster.isMaster) {
125125
sendWork(worker);
126126
});
127127

128-
cluster.on('message', function(worker, results) {
129-
if (typeof results !== 'number') {
130-
// The worker sent us results that are not all successes
131-
if (!workerConfig.sendAll)
132-
failures += results.length;
133-
outFn(formatter(results) + '\r\n');
134-
printProgress();
135-
} else {
136-
successes += results;
137-
}
138-
// Try to give the worker more work to do
139-
sendWork(worker);
140-
});
141-
142128
process.on('exit', function() {
143129
if (showProgress) {
144130
curPath = 'Done';
@@ -149,7 +135,21 @@ if (cluster.isMaster) {
149135
});
150136

151137
for (i = 0; i < numCPUs; ++i)
152-
cluster.fork();
138+
cluster.fork().on('message', onWorkerMessage);
139+
140+
function onWorkerMessage(results) {
141+
if (typeof results !== 'number') {
142+
// The worker sent us results that are not all successes
143+
if (!workerConfig.sendAll)
144+
failures += results.length;
145+
outFn(formatter(results) + '\r\n');
146+
printProgress();
147+
} else {
148+
successes += results;
149+
}
150+
// Try to give the worker more work to do
151+
sendWork(this);
152+
}
153153

154154
function sendWork(worker) {
155155
if (!files || !files.length) {

0 commit comments

Comments
 (0)