Skip to content

Commit

Permalink
net: return this from getConnections()
Browse files Browse the repository at this point in the history
PR-URL: #13553
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Roman Reiss <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
sam-github authored and addaleax committed Jun 17, 2017
1 parent 3facee1 commit 36607fd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions doc/api/net.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ connections use asynchronous `server.getConnections` instead.
added: v0.9.7
-->

* Returns {net.Server}

Asynchronously get the number of concurrent connections on the server. Works
when sockets were sent to forks.

Expand Down
5 changes: 4 additions & 1 deletion lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,8 @@ Server.prototype.getConnections = function(cb) {
}

if (!this._usingSlaves) {
return end(null, this._connections);
end(null, this._connections);
return this;
}

// Poll slaves
Expand All @@ -1570,6 +1571,8 @@ Server.prototype.getConnections = function(cb) {
for (var n = 0; n < this._slaves.length; n++) {
this._slaves[n].getConnections(oncount);
}

return this;
};


Expand Down
11 changes: 7 additions & 4 deletions test/parallel/test-net-pingpong.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@ function pingPongTest(port, host) {

function onSocket(socket) {
assert.strictEqual(socket.server, server);
server.getConnections(common.mustCall(function(err, connections) {
assert.ifError(err);
assert.strictEqual(connections, 1);
}));
assert.strictEqual(
server,
server.getConnections(common.mustCall(function(err, connections) {
assert.ifError(err);
assert.strictEqual(connections, 1);
}))
);

socket.setNoDelay();
socket.timeout = 0;
Expand Down

0 comments on commit 36607fd

Please sign in to comment.