Skip to content

Commit 3de21ac

Browse files
Merge pull request #2516 from adaptlearning/issue/2504
Ensure process.domain is set
2 parents caf49a4 + 2996885 commit 3de21ac

3 files changed

Lines changed: 52 additions & 14 deletions

File tree

lib/application.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,17 @@ Origin.prototype.createServer = function (options, cb) {
290290
requestDomain.session = req.session;
291291
requestDomain.on('error', next);
292292
requestDomain.run(next);
293+
req.domain = requestDomain;
293294
});
294295
server.use(auth.initialize());
295296
server.use(auth.session());
297+
server.use((req, res, next) => {
298+
if (!process.domain) {
299+
// set process.domain again, fixes adaptlearning/adapt_authoring#2504
300+
req.domain.enter();
301+
}
302+
next();
303+
});
296304
server.use(express.static(path.join(require('./configuration').serverRoot, 'frontend', 'build')));
297305
server.use(express.static(path.join(require('./configuration').serverRoot, 'frontend', 'src', 'libraries')));
298306
if(!app.configuration.getConfig('isProduction')) {

package-lock.json

Lines changed: 43 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"mime": "^2.4.4",
6262
"moment": "^2.24.0",
6363
"mongodb-uri": "^0.9.7",
64-
"mongoose": "^5.7.3",
64+
"mongoose": "^5.9.18",
6565
"morgan": "^1.9.1",
6666
"multer": "^1.4.2",
6767
"needle": "^2.4.0",

0 commit comments

Comments
 (0)