GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — http: move free socket error handling to agent · nodejs/node@ff3615d

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib
- _http_agent.js
- _http_client.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/_http_agent.js‎`

Copy file name to clipboardExpand all lines: lib/_http_agent.js

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,13 @@ class ReusedHandle {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
	`60`	`+function freeSocketErrorListener(err) {`
	`61`	`+ const socket = this;`
	`62`	`+ debug('SOCKET ERROR on FREE socket:', err.message, err.stack);`
	`63`	`+ socket.destroy();`
	`64`	`+ socket.emit('agentRemove');`
	`65`	`+}`
	`66`	`+`
`60`	`67`	`function Agent(options) {`
`61`	`68`	`if (!(this instanceof Agent))`
`62`	`69`	`return new Agent(options);`
`@@ -82,6 +89,11 @@ function Agent(options) {`
`82`	`89`	`const name = this.getName(options);`
`83`	`90`	`debug('agent.on(free)', name);`
`84`	`91`
	`92`	`+ // TODO(ronag): socket.destroy(err) might have been called`
	`93`	`+ // before coming here and have an 'error' scheduled. In the`
	`94`	`+ // case of socket.destroy() below this 'error' has no handler`
	`95`	`+ // and could cause unhandled exception.`
	`96`	`+`
`85`	`97`	`if (socket.writable &&`
`86`	`98`	`this.requests[name] && this.requests[name].length) {`
`87`	`99`	`const req = this.requests[name].shift();`
`@@ -118,6 +130,7 @@ function Agent(options) {`
`118`	`130`	`socket.setTimeout(agentTimeout);`
`119`	`131`	`}`
`120`	`132`
	`133`	`+ socket.once('error', freeSocketErrorListener);`
`121`	`134`	`freeSockets.push(socket);`
`122`	`135`	`} else {`
`123`	`136`	`// Implementation doesn't want to keep socket alive`
`@@ -393,6 +406,7 @@ Agent.prototype.keepSocketAlive = function keepSocketAlive(socket) {`
`393`	`406`
`394`	`407`	`Agent.prototype.reuseSocket = function reuseSocket(socket, req) {`
`395`	`408`	`debug('have free socket');`
	`409`	`+ socket.removeListener('error', freeSocketErrorListener);`
`396`	`410`	`req.reusedSocket = true;`
`397`	`411`	`socket.ref();`
`398`	`412`	`};`

Collapse file

`‎lib/_http_client.js‎`

Copy file name to clipboardExpand all lines: lib/_http_client.js

+7-10Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -444,13 +444,6 @@ function socketErrorListener(err) {`
`444`	`444`	`socket.destroy();`
`445`	`445`	`}`
`446`	`446`
`447`		`-function freeSocketErrorListener(err) {`
`448`		`- const socket = this;`
`449`		`- debug('SOCKET ERROR on FREE socket:', err.message, err.stack);`
`450`		`- socket.destroy();`
`451`		`- socket.emit('agentRemove');`
`452`		`-}`
`453`		`-`
`454`	`447`	`function socketOnEnd() {`
`455`	`448`	`const socket = this;`
`456`	`449`	`const req = this._httpMessage;`
`@@ -629,8 +622,11 @@ function responseKeepAlive(req) {`
`629`	`622`	`socket.removeListener('error', socketErrorListener);`
`630`	`623`	`socket.removeListener('data', socketOnData);`
`631`	`624`	`socket.removeListener('end', socketOnEnd);`
`632`		`- socket.once('error', freeSocketErrorListener);`
`633`		`- // There are cases where _handle === null. Avoid those. Passing null to`
	`625`	`+`
	`626`	`+ // TODO(ronag): Between here and emitFreeNT the socket`
	`627`	`+ // has no 'error' handler.`
	`628`	`+`
	`629`	`+ // There are cases where _handle === null. Avoid those. Passing undefined to`
`634`	`630`	`// nextTick() will call getDefaultTriggerAsyncId() to retrieve the id.`
`635`	`631`	`const asyncId = socket._handle ? socket._handle.getAsyncId() : undefined;`
`636`	`632`	`// Mark this socket as available, AFTER user-added end`
`@@ -699,7 +695,6 @@ function tickOnSocket(req, socket) {`
`699`	`695`	`}`
`700`	`696`
`701`	`697`	`parser.onIncoming = parserOnIncomingClient;`
`702`		`- socket.removeListener('error', freeSocketErrorListener);`
`703`	`698`	`socket.on('error', socketErrorListener);`
`704`	`699`	`socket.on('data', socketOnData);`
`705`	`700`	`socket.on('end', socketOnEnd);`
`@@ -739,6 +734,8 @@ function listenSocketTimeout(req) {`
`739`	`734`	`}`
`740`	`735`
`741`	`736`	`ClientRequest.prototype.onSocket = function onSocket(socket) {`
	`737`	`+ // TODO(ronag): Between here and onSocketNT the socket`
	`738`	`+ // has no 'error' handler.`
`742`	`739`	`process.nextTick(onSocketNT, this, socket);`
`743`	`740`	`};`
`744`	`741`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.