worker: handle calling terminate when kHandler is null #28370
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
TimothyGu
reviewed
Jun 22, 2019
elyalvarado
force-pushed
the
terminate-with-null-handlers
branch
from
77806ac to
c59a793
Compare
addaleax
approved these changes
Jun 22, 2019
jasnell
added
the
code-and-learn
elyalvarado
force-pushed
the
terminate-with-null-handlers
branch
from
c59a793 to
4222cd9
Compare
|
Pushed the following changes:
|
elyalvarado
changed the title
TimothyGu
approved these changes
Jun 23, 2019
addaleax
added
the
author ready
|
CI (without rebasing due to the merge commit): https://ci.nodejs.org/job/node-test-pull-request/24264/ |
This comment has been minimized.
This comment has been minimized.
BridgeAR
approved these changes
Jul 4, 2019
Trott
approved these changes
Jul 5, 2019
jasnell
reviewed
Jul 15, 2019
jasnell
approved these changes
Jul 17, 2019
|
Can you remove the merge commit? Our Ci does not handle them well. |
This PR makes a change to the Worker.terminate() when called if the kHandler is null. Before this pull request it was returning undefined, but the API is expecting a promise. With the changes in this PR if terminate is called a Promise.resolve() is returned, unless a callback is passed in which case the old behavior stays (returns undefined).
This change makes terminate always return a promise even if kHandler is null
The deprecation warning is printed even if the kHandler is null
...and make the linter happy
Trott
force-pushed
the
terminate-with-null-handlers
branch
from
fd7f67e to
3916e59
Compare
|
Rebased against master and force pushed to eliminate the merge commit so we can run Ci and get this landed.... |
|
Thanks @Trott I was precisely going to ask how should I eliminate the merge commit. Now I know 😉. You all rock 🎸 |
Trott
pushed a commit
to Trott/io.js
that referenced
this pull request
Jul 31, 2019
This PR makes a change to the Worker.terminate() when called if the kHandler is null. Before this pull request it was returning undefined, but the API is expecting a promise. With the changes in this PR if terminate is called a Promise.resolve() is returned, unless a callback is passed in which case the old behavior stays (returns undefined). PR-URL: nodejs#28370 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
|
Landed in 9083a67. Thanks for the contribution! 🎉 (If you're interested in other possible contributions to Node.js but don't have a good idea of where to start looking, some ideas are posted at https://www.nodetodo.org/next-steps/.) |
targos
pushed a commit
that referenced
this pull request
Aug 2, 2019
This PR makes a change to the Worker.terminate() when called if the kHandler is null. Before this pull request it was returning undefined, but the API is expecting a promise. With the changes in this PR if terminate is called a Promise.resolve() is returned, unless a callback is passed in which case the old behavior stays (returns undefined). PR-URL: #28370 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@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.
This PR makes a change to the Worker.terminate() method when
called if the kHandler is null. Before this pull request it was returning
undefined, but the API is expecting a promise. With the changes in
this PR if terminate is called and kHandler is null a resolved Promise
is returned even if a callback is passed, to be consistent with the API
surface, and with always return promises.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes