properly clear completion timeouts #85
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jkrems
requested changes
Jun 7, 2018
| @@ -146,6 +146,10 @@ module.exports = Hub = function() { | |||
| hub.emit('start', baseLog); | |||
| handleResult = function(error, response, body) { | |||
| var apiError, logLine, maxStatusCode, minStatusCode, parseError, parseJSON, ref5, ref6, ref7, successfulRequest, uri; | |||
| if (responseData.completionSuccessful) { | |||
| responseData.completionSuccessful(); | |||
| delete responseData.completionSuccessful; | |||
There was a problem hiding this comment.
I don't think this line is doing anything:
const o = Object.defineProperty({}, 'cS', { value: 42 })
// {}
o.cS
// 42
delete o.cS
// false
o.cS
// 42By default the property isn't writeable or configurable so deleting won't do anything (other than potentially throw in strict mode).
There was a problem hiding this comment.
Good to know - wondered, should have checked :-)
lib/hub.js
Outdated
| @@ -312,7 +316,9 @@ module.exports = Hub = function() { | |||
| clearTimeout(completionTimeout); | |||
| return completionTimeout = null; | |||
| }; | |||
| req.on('complete', completionSuccessful); | |||
| Object.defineProperty(responseData, 'completionSuccessful', { | |||
There was a problem hiding this comment.
I think given that this is a function property, it should be okay to just set it. JSON.stringify and friends will omit it. Alternatively you could use a Symbol to "hide" it.
This makes `keepAlive: true` not terminate the connection after `completionTimeout` ms The code depended on a `complete` event being emitted by `request`, but AFAICT it only does that for non-callback invocations. This explicitly clears it ourselves - `responseData` was the only good place I could see to put the call that didn't require a major refactoring. See: https://github.com/request/request/blob/a6741d415aba31cd01e9c4544c96f84ea6ed11e3/request.js#L1088-L1094
dbushong
force-pushed
the
dbushong/feature/2.x/fix-completion-timeout
branch
from
7aea769
to
780c998
Compare
|
Better? |
jkrems
approved these changes
Jun 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes
keepAlive: truenot terminate the connection aftercompletionTimeoutmsThe code depended on a
completeevent being emitted byrequest, but AFAICTit only does that for non-callback invocations.
This explicitly clears it ourselves -
responseDatawas the only goodplace I could see to put the call that didn't require a major refactoring.
See: https://github.com/request/request/blob/a6741d415aba31cd01e9c4544c96f84ea6ed11e3/request.js#L1088-L1094