net: use _final instead of on('finish')
#18608
Closed
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
lpinca
approved these changes
Feb 7, 2018
lib/net.js
Outdated
| return self._handle.shutdown(req); | ||
| } | ||
|
|
||
| // the user has called .end(), and all the bytes have been | ||
| // sent out to the other side. | ||
| function onSocketFinish() { | ||
| Socket.prototype._final = function(cb) { | ||
| // If still connecting - defer handling 'finish' until 'connect' will happen |
There was a problem hiding this comment.
Nit: I'd remove handling 'finish' as we are no longer handling the 'finish' event.
There was a problem hiding this comment.
@lpinca done! And thanks for the reviews, it’s really helpful to talk this through with you!
2 tasks
jasnell
approved these changes
Feb 9, 2018
|
@addaleax please always trigger a CI after opening a PR :-) |
I usually wait until the first review or so, since the PR likely needs to be updated after it anyway. |
addaleax
added
the
author ready
mcollina
reviewed
Feb 17, 2018
| @@ -55,6 +55,8 @@ function undestroy() { | |||
| this._writableState.destroyed = false; | |||
| this._writableState.ended = false; | |||
| this._writableState.ending = false; | |||
| this._writableState.finalCalled = false; | |||
| this._writableState.prefinished = false; | |||
There was a problem hiding this comment.
can you add a unit test for those? Maybe also place them in a separate commit, if we want to backport them separately.
There was a problem hiding this comment.
@mcollina Do you know where those tests are? In any case, these lines are tested in the sense that tests do fail without them...
There was a problem hiding this comment.
We need test that can be run as part of readable-stream.
Here are the current tests:
test/parallel/test-stream-duplex-destroy.js
test/parallel/test-stream-readable-destroy.js
test/parallel/test-stream-transform-destroy.js
test/parallel/test-stream-writable-destroy.js
BridgeAR
removed
the
author ready
Shutting down the connection is what `_final` is there for.
|
@mcollina Thanks for the pointer, done! |
addaleax
added
the
author ready
|
Landed in 906bbef |
addaleax
removed
the
author ready
|
@addaleax it seems this landed without metadata. |
|
@lpinca I’ve force-pushed that mistake away, thanks for pointing it out. |
addaleax
added a commit
that referenced
this pull request
Feb 21, 2018
Shutting down the connection is what `_final` is there for. PR-URL: #18608 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
addaleax
added a commit
to addaleax/node
that referenced
this pull request
Feb 26, 2018
Shutting down the connection is what `_final` is there for. PR-URL: nodejs#18608 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
BridgeAR
pushed a commit
to BridgeAR/node
that referenced
this pull request
May 1, 2018
Shutting down the connection is what `_final` is there for. PR-URL: nodejs#18608 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
MayaLekova
pushed a commit
to MayaLekova/node
that referenced
this pull request
May 8, 2018
Shutting down the connection is what `_final` is there for. PR-URL: nodejs#18608 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
addaleax
added a commit
that referenced
this pull request
Jun 29, 2018
Shutting down the connection is what `_final` is there for. PR-URL: #18608 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Merged
rvagg
pushed a commit
that referenced
this pull request
Aug 16, 2018
Shutting down the connection is what `_final` is there for. PR-URL: #18608 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
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.
Shutting down the connection is what
_finalis there for.Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
net