cluster: removed unused addressType argument from constructor

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 <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Andrey Pechkurov <[email protected]>
nodejs · Apr 30, 2020 · 8e02d77 · 8e02d77
1 parent 892a0ba
commit 8e02d77
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
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
@@ -14,7 +14,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;