Skip to content

workers: fix invalid exit code in parent upon uncaught exception #21713

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
lundibundi wants to merge 3 commits into from
Closed

workers: fix invalid exit code in parent upon uncaught exception #21713

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
483cdec
workers: fix invalid exit code in parent upon uncaught exception
lundibundi Jul 8, 2018
180abec
fixup! workers: fix invalid exit code in parent upon uncaught exception
lundibundi Jul 9, 2018
004c004
fixup! workers: fix invalid exit code in parent upon uncaught exception
lundibundi Jul 9, 2018
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
Prev Previous commit
fixup! workers: fix invalid exit code in parent upon uncaught exception
  • Loading branch information
@lundibundi
lundibundi committed Jul 9, 2018
commit 004c004b740d57b32c7c71a8f91c3792e568dc2d
11 changes: 3 additions & 8 deletions lib/internal/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,10 +445,6 @@ function setupChild(evalScript) {

function fatalException(error) {
debug(`[${threadId}] gets fatal exception`);

// set exit code for local worker's 'exit' listeners
process.exitCode = 1;

let caught = false;
try {
caught = originalFatalException.call(this, error);
Expand All @@ -458,6 +454,9 @@ function setupChild(evalScript) {
debug(`[${threadId}] fatal exception caught = ${caught}`);

if (!caught) {
// set correct code (uncaughtException) for [kOnExit](code) handler
process.exitCode = 1;

let serialized;
try {
serialized = serializeError(error);
Expand All @@ -471,10 +470,6 @@ function setupChild(evalScript) {
else
port.postMessage({ type: messageTypes.COULD_NOT_SERIALIZE_ERROR });
clearAsyncIdStack();
} else if (process.exitCode === 1) {
// user caught an exception and didn't change the exit code -> assume it
// was handled
process.exitCode = 0;
}
}
}
Expand Down