summaryrefslogtreecommitdiff
path: root/lib/domain.js
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-09-20 15:13:36 -0700
committerisaacs <i@izs.me>2012-09-21 09:22:50 -0700
commit040057167653e8e6ce4d5a368fbc6d73bb541e28 (patch)
tree09752bc5b51dce7c13f5e7f9b60f213ba9e91a98 /lib/domain.js
parent43a2b291822416eb5f72d17ad250e7542abb0581 (diff)
downloadnode-new-040057167653e8e6ce4d5a368fbc6d73bb541e28.tar.gz
domain: Properly exit() on domain disposal
This addresses #4034. There are two problems happening: 1. The domain is not exited automatically when calling dispose() on it. Then, since the domain is disposed, attempting to exit it again will do nothing. 2. The active domain is stored on process.domain. Since thrown errors call `process.emit('uncaughtException', er)`, and the process is an event emitter with a `.domain` member, it re-enters the domain a second time before calling the error handler, pushing it onto the stack again. Thus, if the handler calls `domain.dispose()`, then the domain is now on the stack twice, and cannot be exited properly. Since the domain is disposed, any subsequent IO will be no-op'ed, since we've declared that this context is done and best forgotten. The solution here is twofold: 1. In EventEmitter.emit, do not enter the domain if `this===process`. 2. Automatically exit the domain when calling `domain.dispose()`.
Diffstat (limited to 'lib/domain.js')
-rw-r--r--lib/domain.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/domain.js b/lib/domain.js
index e219c5e507..31f5df4932 100644
--- a/lib/domain.js
+++ b/lib/domain.js
@@ -59,7 +59,7 @@ function uncaughtHandler(er) {
domain_thrown: true
});
exports.active.emit('error', er);
- exports.active.exit();
+ if (exports.active) exports.active.exit();
} else if (process.listeners('uncaughtException').length === 1) {
// if there are other handlers, then they'll take care of it.
// but if not, then we need to crash now.
@@ -207,8 +207,13 @@ Domain.prototype.bind = function(cb, interceptError) {
};
Domain.prototype.dispose = function() {
+ console.error('dispose', this, exports.active, process.domain)
+
if (this._disposed) return;
+ // if we're the active domain, then get out now.
+ this.exit();
+
this.emit('dispose');
// remove error handlers.