cluster: removed unused addressType argument from constructor

yashLadha · BethGriggs · commit 4035cbe63134 · 2020-04-28T23:00:40.000+01:00
When intializing the constructor for cluster master we are heavily using a generic structure, but the effect of passing arguments that are related to shared_handle is that there is a stale argument passed. We can avoid such scenarios as all the remaining entities are being destructured from the message object. PR-URL: #32963 Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Andrey Pechkurov <apechkurov@gmail.com>
diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js
@@ -297,12 +297,7 @@ function queryServer(worker, message) {
       constructor = SharedHandle;
     }
 
-    handle = new constructor(key,
-                             address,
-                             message.port,
-                             message.addressType,
-                             message.fd,
-                             message.flags);
+    handle = new constructor(key, address, message);
     handles.set(key, handle);
   }
 
diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
@@ -13,7 +13,7 @@ const { constants } = internalBinding('tcp_wrap');
 
 module.exports = RoundRobinHandle;
 
-function RoundRobinHandle(key, address, port, addressType, fd, flags) {
+function RoundRobinHandle(key, address, { port, fd, flags }) {
   this.key = key;
   this.all = new Map();
   this.free = new Map();
diff --git a/lib/internal/cluster/shared_handle.js b/lib/internal/cluster/shared_handle.js
@@ -6,7 +6,7 @@ const net = require('net');
 
 module.exports = SharedHandle;
 
-function SharedHandle(key, address, port, addressType, fd, flags) {
+function SharedHandle(key, address, { port, addressType, fd, flags }) {
   this.key = key;
   this.workers = new Map();
   this.handle = null;

Original file line number	Diff line number	Diff line change
`@@ -297,12 +297,7 @@ function queryServer(worker, message) {`
`297`	`297`	`constructor = SharedHandle;`
`298`	`298`	`}`
`299`	`299`
`300`		`- handle = new constructor(key,`
`301`		`- address,`
`302`		`- message.port,`
`303`		`- message.addressType,`
`304`		`- message.fd,`
`305`		`- message.flags);`
	`300`	`+ handle = new constructor(key, address, message);`
`306`	`301`	`handles.set(key, handle);`
`307`	`302`	`}`
`308`	`303`