summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeijia Wang <starkwang@126.com>2018-10-30 16:33:00 +0800
committerRich Trott <rtrott@gmail.com>2018-11-03 19:40:18 -0700
commitc1e670338ba105faaf6df3e8ab7086bede04ad6f (patch)
tree3f0c8101290fb1893bc50bb542b4752aff1266de
parent7825045ee695e9e5c048133255a3b614e04c98d3 (diff)
downloadandroid-node-v8-c1e670338ba105faaf6df3e8ab7086bede04ad6f.tar.gz
android-node-v8-c1e670338ba105faaf6df3e8ab7086bede04ad6f.tar.bz2
android-node-v8-c1e670338ba105faaf6df3e8ab7086bede04ad6f.zip
repl: use promise#finally
PR-URL: https://github.com/nodejs/node/pull/23971 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
-rw-r--r--lib/repl.js14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/repl.js b/lib/repl.js
index 2ecb5abaa4..75750ca1cd 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -376,18 +376,8 @@ function REPLServer(prompt,
}
promise.then((result) => {
- // Remove prioritized SIGINT listener if it was not called.
- // TODO(TimothyGu): Use Promise.prototype.finally when it becomes
- // available.
- prioritizedSigintQueue.delete(sigintListener);
-
finishExecution(undefined, result);
- unpause();
}, (err) => {
- // Remove prioritized SIGINT listener if it was not called.
- prioritizedSigintQueue.delete(sigintListener);
-
- unpause();
if (err && process.domain) {
debug('not recoverable, send to domain');
process.domain.emit('error', err);
@@ -395,6 +385,10 @@ function REPLServer(prompt,
return;
}
finishExecution(err);
+ }).finally(() => {
+ // Remove prioritized SIGINT listener if it was not called.
+ prioritizedSigintQueue.delete(sigintListener);
+ unpause();
});
}
}