Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 <devnexen@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Andrey Pechkurov <apechkurov@gmail.com>
  • Loading branch information
yashLadha authored and targos committed May 13, 2020
1 parent 08b66f2 commit d217b79
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
7 changes: 1 addition & 6 deletions lib/internal/cluster/master.js
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/internal/cluster/round_robin_handle.js
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/cluster/shared_handle.js
Expand Up @@ -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;
Expand Down

0 comments on commit d217b79

Please sign in to comment.