From 7d61feb411c130e53acf4aa092d18a6cd016e0f2 Mon Sep 17 00:00:00 2001 From: "Raynos (Jake Verbaten)" Date: Fri, 18 Apr 2014 13:54:16 -0700 Subject: [PATCH 1/2] Check that `process.domain` still exists --- index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 0291f17..8bdd8ce 100644 --- a/index.js +++ b/index.js @@ -574,7 +574,9 @@ function try_callback(client, callback, reply) { } catch (err) { if (process.domain) { process.domain.emit('error', err); - process.domain.exit(); + if (process.domain) { + process.domain.exit(); + } } else { client.emit("error", err); } From d34308ea4c53f16c6a402d8d318644abe52d9118 Mon Sep 17 00:00:00 2001 From: Raynos Date: Fri, 18 Apr 2014 13:57:35 -0700 Subject: [PATCH 2/2] check process.domain is STILL currDomain --- index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 8bdd8ce..e571de0 100644 --- a/index.js +++ b/index.js @@ -573,9 +573,10 @@ function try_callback(client, callback, reply) { callback(null, reply); } catch (err) { if (process.domain) { - process.domain.emit('error', err); - if (process.domain) { - process.domain.exit(); + var currDomain = process.domain; + currDomain.emit('error', err); + if (process.domain === currDomain) { + currDomain.exit(); } } else { client.emit("error", err);