From 641f4e79d915bbdb0c50ecc5fd6f676ab1ac8912 Mon Sep 17 00:00:00 2001 From: tknew2 Date: Wed, 5 Feb 2014 09:48:32 +0100 Subject: [PATCH] restore uncaughrexception logic --- examples/killslow.js | 5 +++++ lib/ProcessContainer.js | 16 ++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 examples/killslow.js diff --git a/examples/killslow.js b/examples/killslow.js new file mode 100644 index 00000000..e2309352 --- /dev/null +++ b/examples/killslow.js @@ -0,0 +1,5 @@ + + +setTimeout(function() { + throw new Error('ok'); +}, 1100); diff --git a/lib/ProcessContainer.js b/lib/ProcessContainer.js index d52a84c1..8fa988f6 100644 --- a/lib/ProcessContainer.js +++ b/lib/ProcessContainer.js @@ -104,16 +104,12 @@ function exec(script, outFile, errFile) { } }); - - process.exit(cst.CODE_UNCAUGHTEXCEPTION); - // if (!process.listeners('uncaughtException').filter(function (listener) { - // return listener !== uncaughtListener; - // }).length) { - // stderr.write(err.stack); - // process.exit(cst.CODE_UNCAUGHTEXCEPTION); - // } - - + if (!process.listeners('uncaughtException').filter(function (listener) { + return listener !== uncaughtListener; + }).length) { + stderr.write(err.stack); + process.exit(cst.CODE_UNCAUGHTEXCEPTION); + } });