Skip to content

Commit

Permalink
domains: fix stack clearing after error handled
Browse files Browse the repository at this point in the history
caeb677 introduced a regression where
the domains stack would not be cleared after an error had been handled
by the top-level domain.

This change clears the domains stack regardless of the position of the
active domain in the stack.

PR: #9364
PR-URL: nodejs/node-v0.x-archive#9364
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  • Loading branch information
dohse authored and Julien Gilli committed Mar 11, 2015
1 parent 51fe319 commit f2a45ca
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 7 deletions.
20 changes: 13 additions & 7 deletions src/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@
return startup._lazyConstants;
};

function _clearDomainsStack() {
var domainModule = NativeModule.require('domain');
var domainStack = domainModule._stack;
domainStack.length = 0;
domainModule.active = null;
process.domain = null;
}

startup.processFatal = function() {
// call into the active domain, or emit uncaughtException,
// and exit if there are no listeners.
Expand Down Expand Up @@ -268,13 +276,6 @@
// If caught is false after this, then there's no need to exit()
// the domain, because we're going to crash the process anyway.
caught = domain.emit('error', er);

// Exit all domains on the stack. Uncaught exceptions end the
// current tick and no domains should be left on the stack
// between ticks.
var domainModule = NativeModule.require('domain');
domainStack.length = 0;
domainModule.active = process.domain = null;
} catch (er2) {
// The domain error handler threw! oh no!
// See if another domain can catch THIS error,
Expand All @@ -291,6 +292,11 @@
}
}
}

// Exit all domains on the stack. Uncaught exceptions end the
// current tick and no domains should be left on the stack
// between ticks.
_clearDomainsStack();
} else {
caught = process.emit('uncaughtException', er);
}
Expand Down
41 changes: 41 additions & 0 deletions test/simple/test-domain-top-level-error-handler-clears-stack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var assert = require('assert');
var domain = require('domain');

/*
* Make sure that the domains stack is cleared after a top-level domain
* error handler exited gracefully.
*/
var d = domain.create();

d.on('error', function() {
process.nextTick(function() {
if (domain._stack.length !== 1) {
process.exit(1);
}
});
});

d.run(function() {
throw new Error('Error from domain');
});

0 comments on commit f2a45ca

Please sign in to comment.