cluster: improve for-loop

gengjiawen · BridgeAR · commit 2a3cca7ec566 · 2019-03-12T20:57:43.000+01:00
PR-URL: #26336 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js
@@ -80,10 +80,7 @@ cluster.setupMaster = function(options) {
 if (message.cmd !== 'NODE_DEBUG_ENABLED')
 return;
 
- var key;
- for (key in cluster.workers) {
- const worker = cluster.workers[key];
-
+ for (const worker of Object.values(cluster.workers)) {
 if (worker.state === 'online' || worker.state === 'listening') {
 process._debugProcess(worker.process.pid);
 } else {
@@ -227,11 +224,10 @@ cluster.disconnect = function(cb) {
 if (workers.length === 0) {
 process.nextTick(() => intercom.emit('disconnect'));
 } else {
- for (var key in workers) {
- key = workers[key];
-
- if (cluster.workers[key].isConnected())
- cluster.workers[key].disconnect();
+ for (const worker of Object.values(cluster.workers)) {
+ if (worker.isConnected()) {
+ worker.disconnect();
+ }
 }
 }
 

-Original file line number
+Diff line change
 if(message.cmd!=='NODE_DEBUG_ENABLED')
 return;
 -varkey;
 -for(keyincluster.workers){
 -constworker=cluster.workers[key];
+-
 +for(constworkerofObject.values(cluster.workers)){
 if(worker.state==='online'||worker.state==='listening'){
 process._debugProcess(worker.process.pid);
 }else{
 if(workers.length===0){
 process.nextTick(()=>intercom.emit('disconnect'));
 }else{
 -for(varkeyinworkers){
 -key=workers[key];
+-
 -if(cluster.workers[key].isConnected())
 -cluster.workers[key].disconnect();
 +for(constworkerofObject.values(cluster.workers)){
 +if(worker.isConnected()){
 +worker.disconnect();
 +}
+}
+}