Skip to content

Commit

Permalink
http: start connections checking interval on listen
Browse files Browse the repository at this point in the history
Co-authored-by: Luigi Pinca <luigipinca@gmail.com>
PR-URL: #48611
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
  • Loading branch information
2 people authored and targos committed Nov 26, 2023
1 parent cb43717 commit 8874b2e
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 6 deletions.
21 changes: 16 additions & 5 deletions lib/_http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -493,14 +493,16 @@ function storeHTTPOptions(options) {
}
}

function setupConnectionsTracking(server) {
function setupConnectionsTracking() {
// Start connection handling
server[kConnections] = new ConnectionsList();
if (!this[kConnections]) {
this[kConnections] = new ConnectionsList();
}

// This checker is started without checking whether any headersTimeout or requestTimeout is non zero
// otherwise it would not be started if such timeouts are modified after createServer.
server[kConnectionsCheckingInterval] =
setInterval(checkConnections.bind(server), server.connectionsCheckingInterval).unref();
this[kConnectionsCheckingInterval] =
setInterval(checkConnections.bind(this), this.connectionsCheckingInterval).unref();
}

function Server(options, requestListener) {
Expand Down Expand Up @@ -533,11 +535,12 @@ function Server(options, requestListener) {
this.httpAllowHalfOpen = false;

this.on('connection', connectionListener);
this.on('listening', setupConnectionsTracking);

this.timeout = 0;
this.maxHeadersCount = null;
this.maxRequestsPerSocket = 0;
setupConnectionsTracking(this);

this[kUniqueHeaders] = parseUniqueHeadersOption(options.uniqueHeaders);
}
ObjectSetPrototypeOf(Server.prototype, net.Server.prototype);
Expand All @@ -549,6 +552,10 @@ Server.prototype.close = function() {
};

Server.prototype.closeAllConnections = function() {
if (!this[kConnections]) {
return;
}

const connections = this[kConnections].all();

for (let i = 0, l = connections.length; i < l; i++) {
Expand All @@ -557,6 +564,10 @@ Server.prototype.closeAllConnections = function() {
};

Server.prototype.closeIdleConnections = function() {
if (!this[kConnections]) {
return;
}

const connections = this[kConnections].idle();

for (let i = 0, l = connections.length; i < l; i++) {
Expand Down
3 changes: 2 additions & 1 deletion lib/https.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ function Server(opts, requestListener) {

this.timeout = 0;
this.maxHeadersCount = null;
setupConnectionsTracking(this);
this.on('listening', setupConnectionsTracking);
}

ObjectSetPrototypeOf(Server.prototype, tls.Server.prototype);
ObjectSetPrototypeOf(Server, tls.Server);

Expand Down
24 changes: 24 additions & 0 deletions test/parallel/test-http-server-connections-checking-leak.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use strict';

// Flags: --expose-gc

// Check that creating a server without listening does not leak resources.

require('../common');
const onGC = require('../common/ongc');
const Countdown = require('../common/countdown');

const http = require('http');
const max = 100;

// Note that Countdown internally calls common.mustCall, that's why it's not done here.
const countdown = new Countdown(max, () => {});

for (let i = 0; i < max; i++) {
const server = http.createServer((req, res) => {});
onGC(server, { ongc: countdown.dec.bind(countdown) });
}

setImmediate(() => {
global.gc();
});
29 changes: 29 additions & 0 deletions test/parallel/test-https-server-connections-checking-leak.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';

// Flags: --expose-gc

// Check that creating a server without listening does not leak resources.

const common = require('../common');

if (!common.hasCrypto) {
common.skip('missing crypto');
}

const onGC = require('../common/ongc');
const Countdown = require('../common/countdown');

const https = require('https');
const max = 100;

// Note that Countdown internally calls common.mustCall, that's why it's not done here.
const countdown = new Countdown(max, () => {});

for (let i = 0; i < max; i++) {
const server = https.createServer((req, res) => {});
onGC(server, { ongc: countdown.dec.bind(countdown) });
}

setImmediate(() => {
global.gc();
});

0 comments on commit 8874b2e

Please sign in to comment.