Skip to content

http: Eliminate ClientRequest capture by Agent socket listeners #10134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
evantorrie wants to merge 4 commits into from
Closed

http: Eliminate ClientRequest capture by Agent socket listeners #10134

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3967101
Eliminate capture of "cb" in createSocket context
evantorrie Dec 5, 2016
f774e72
change to local function instead of prototype
evantorrie Dec 6, 2016
eb5b0d3
change self to agent
evantorrie Dec 7, 2016
518d33d
http: eliminate capture of ClientRequest in Agent
evantorrie Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Eliminate capture of "cb" in createSocket context 
Move the onFree/onClose/onRemote listeners to a separate function
  • Loading branch information
@evantorrie
evantorrie committed Dec 9, 2016
commit 3967101032afeccdcc8e3c3e2cd6830977a179b9
58 changes: 32 additions & 26 deletions lib/_http_agent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,36 +206,42 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
}
self.sockets[name].push(s);
debug('sockets', name, self.sockets[name].length);

function onFree() {
self.emit('free', s, options);
}
s.on('free', onFree);

function onClose(err) {
debug('CLIENT socket onClose');
// This is the only place where sockets get removed from the Agent.
// If you want to remove a socket from the pool, just close it.
// All socket errors end in a close event anyway.
self.removeSocket(s, options);
}
s.on('close', onClose);

function onRemove() {
// We need this function for cases like HTTP 'upgrade'
// (defined by WebSockets) where we need to remove a socket from the
// pool because it'll be locked up indefinitely
debug('CLIENT socket onRemove');
self.removeSocket(s, options);
s.removeListener('close', onClose);
s.removeListener('free', onFree);
s.removeListener('agentRemove', onRemove);
}
s.on('agentRemove', onRemove);
self._installListeners(s,options);
cb(null, s);
}
};

Agent.prototype._installListeners = function installListeners(s, options) {
Copy link
Copy Markdown
Contributor

@cjihrig cjihrig Dec 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you do this without attaching to the prototype. In its current form, this will become unofficial API that we'll have to maintain.

Copy link
Copy Markdown
Contributor Author

@evantorrie evantorrie Dec 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it to just a file level function.

var self = this;

function onFree() {
debug('CLIENT socket onFree');
self.emit('free', s, options);
}
s.on('free', onFree);

function onClose(err) {
debug('CLIENT socket onClose');
// This is the only place where sockets get removed from the Agent.
// If you want to remove a socket from the pool, just close it.
// All socket errors end in a close event anyway.
self.removeSocket(s, options);
}
s.on('close', onClose);

function onRemove() {
// We need this function for cases like HTTP 'upgrade'
// (defined by WebSockets) where we need to remove a socket from the
// pool because it'll be locked up indefinitely
debug('CLIENT socket onRemove');
self.removeSocket(s, options);
s.removeListener('close', onClose);
s.removeListener('free', onFree);
s.removeListener('agentRemove', onRemove);
}
s.on('agentRemove', onRemove);
};

Agent.prototype.removeSocket = function removeSocket(s, options) {
var name = this.getName(options);
debug('removeSocket', name, 'writable:', s.writable);
Expand Down