1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repl: refactor ERR_SCRIPT_EXECUTION_INTERRUPTED stack handling

Browse Source 
The stack was removed later on instead of never being attached in
the first place.

PR-URL: https://github.com/nodejs/node/pull/22436
Refs: https://github.com/nodejs/node/issues/20253
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Ruben Bridgewater 2018-08-21 16:32:54 +02:00
parent ccb303e037
commit 2eef077834
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/repl.js
View File

@ -345,11 +345,6 @@ function REPLServer(prompt,
} catch (e) { } catch (e) {
err = e; err = e;
if (err && err.code === 'ERR_SCRIPT_EXECUTION_INTERRUPTED') {
// The stack trace for this case is not very useful anyway.
Object.defineProperty(err, 'stack', { value: '' });
}
if (process.domain) { if (process.domain) {
debug('not recoverable, send to domain'); debug('not recoverable, send to domain');
process.domain.emit('error', err); process.domain.emit('error', err);
@ -365,7 +360,11 @@ function REPLServer(prompt,
if (self.breakEvalOnSigint) { if (self.breakEvalOnSigint) {
const interrupt = new Promise((resolve, reject) => { const interrupt = new Promise((resolve, reject) => {
sigintListener = () => { sigintListener = () => {
reject(new ERR_SCRIPT_EXECUTION_INTERRUPTED()); const tmp = Error.stackTraceLimit;
Error.stackTraceLimit = 0;
const err = new ERR_SCRIPT_EXECUTION_INTERRUPTED();
Error.stackTraceLimit = tmp;
reject(err);
}; };
prioritizedSigintQueue.add(sigintListener); prioritizedSigintQueue.add(sigintListener);
}); });
@ -384,11 +383,6 @@ function REPLServer(prompt,
// Remove prioritized SIGINT listener if it was not called. // Remove prioritized SIGINT listener if it was not called.
prioritizedSigintQueue.delete(sigintListener); prioritizedSigintQueue.delete(sigintListener);
if (err.code === 'ERR_SCRIPT_EXECUTION_INTERRUPTED') {
// The stack trace for this case is not very useful anyway.
Object.defineProperty(err, 'stack', { value: '' });
}
unpause(); unpause();
if (err && process.domain) { if (err && process.domain) {
debug('not recoverable, send to domain'); debug('not recoverable, send to domain');