net: return this from getConnections()

sam-github · addaleax · commit a839aede3ece · 2017-07-11T19:16:41.000+02:00
PR-URL: #13553 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Roman Reiss <me@silverwind.io> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/doc/api/net.md b/doc/api/net.md
@@ -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.
 
diff --git a/lib/net.js b/lib/net.js
@@ -1558,7 +1558,8 @@ Server.prototype.getConnections = function(cb) {
   }
 
   if (!this._usingSlaves) {
-    return end(null, this._connections);
+    end(null, this._connections);
+    return this;
   }
 
   // Poll slaves
@@ -1578,6 +1579,8 @@ Server.prototype.getConnections = function(cb) {
   for (var n = 0; n < this._slaves.length; n++) {
     this._slaves[n].getConnections(oncount);
   }
+
+  return this;
 };
 
 
diff --git a/test/parallel/test-net-pingpong.js b/test/parallel/test-net-pingpong.js
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1558,7 +1558,8 @@ Server.prototype.getConnections = function(cb) {`
`1558`	`1558`	`}`
`1559`	`1559`
`1560`	`1560`	`if (!this._usingSlaves) {`
`1561`		`- return end(null, this._connections);`
	`1561`	`+ end(null, this._connections);`
	`1562`	`+ return this;`
`1562`	`1563`	`}`
`1563`	`1564`
`1564`	`1565`	`// Poll slaves`
`@@ -1578,6 +1579,8 @@ Server.prototype.getConnections = function(cb) {`
`1578`	`1579`	`for (var n = 0; n < this._slaves.length; n++) {`
`1579`	`1580`	`this._slaves[n].getConnections(oncount);`
`1580`	`1581`	`}`
	`1582`	`+`
	`1583`	`+ return this;`
`1581`	`1584`	`};`
`1582`	`1585`
`1583`	`1586`