From a6503edce02fd3e61db83cf92fb51343cf8728fb Mon Sep 17 00:00:00 2001 From: Julien Gilli Date: Mon, 8 Oct 2018 15:29:42 -0700 Subject: [PATCH] use domaine instead of domain --- lib/server.js | 4 ++-- package.json | 1 + test/lib/helper.js | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/server.js b/lib/server.js index 4065e18d1..c910f01e8 100644 --- a/lib/server.js +++ b/lib/server.js @@ -2,7 +2,7 @@ 'use strict'; -var domain = require('domain'); +var domaine = require('domaine'); var EventEmitter = require('events').EventEmitter; var http = require('http'); var https = require('https'); @@ -823,7 +823,7 @@ Server.prototype._onRequest = function _onRequest(req, res) { // It has significant negative performance impact // Warning: this feature depends on the deprecated domains module if (self.handleUncaughtExceptions) { - var handlerDomain = domain.create(); + var handlerDomain = domaine.create(); handlerDomain.add(req); handlerDomain.add(res); handlerDomain.on('error', function onError(err) { diff --git a/package.json b/package.json index ec8585851..d2cacaea8 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,7 @@ "assert-plus": "^1.0.0", "bunyan": "^1.8.12", "csv": "^1.1.1", + "domaine": "git+https://github.com/misterdjules/domaine.git#alternative-approach", "escape-regexp-component": "^1.0.2", "ewma": "^2.0.1", "find-my-way": "^2.0.1", diff --git a/test/lib/helper.js b/test/lib/helper.js index 92fc2473d..2cb8cee5b 100644 --- a/test/lib/helper.js +++ b/test/lib/helper.js @@ -7,7 +7,7 @@ 'use strict'; /* eslint-disable func-names */ -var domain = require('domain'); +var domaine = require('domaine'); var bunyan = require('bunyan'); var once = require('once'); @@ -19,7 +19,7 @@ var restify = require('../../lib'); module.exports = { after: function after(teardown) { module.parent.exports.tearDown = function _teardown(callback) { - var d = domain.create(); + var d = domaine.create(); var self = this; d.once('error', function(err) { @@ -35,7 +35,7 @@ module.exports = { before: function before(setup) { module.parent.exports.setUp = function _setup(callback) { - var d = domain.create(); + var d = domaine.create(); var self = this; d.once('error', function(err) { @@ -51,7 +51,7 @@ module.exports = { test: function test(name, tester) { module.parent.exports[name] = function _(t) { - var d = domain.create(); + var d = domaine.create(); var self = this; d.once('error', function(err) { @@ -60,6 +60,7 @@ module.exports = { }); d.add(t); + d.run(function() { t.end = once(function() { t.done();