From 3644db68487e759cbfe6eb43a46cae271a769662 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 10 Sep 2020 10:36:15 +0100 Subject: [PATCH] [misc] mongodb: use the new db connector by default mongojs was enabling it by default as well. --- services/docstore/app/js/mongodb.js | 5 ++++- services/docstore/config/settings.defaults.js | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/services/docstore/app/js/mongodb.js b/services/docstore/app/js/mongodb.js index e9c425ad95..566b9a07e9 100644 --- a/services/docstore/app/js/mongodb.js +++ b/services/docstore/app/js/mongodb.js @@ -1,7 +1,10 @@ const Settings = require('settings-sharelatex') const { MongoClient, ObjectId } = require('mongodb') -const clientPromise = MongoClient.connect(Settings.mongo.url) +const clientPromise = MongoClient.connect( + Settings.mongo.url, + Settings.mongo.options +) let setupDbPromise async function waitForDb() { diff --git a/services/docstore/config/settings.defaults.js b/services/docstore/config/settings.defaults.js index c538b79045..54dc112709 100644 --- a/services/docstore/config/settings.defaults.js +++ b/services/docstore/config/settings.defaults.js @@ -14,7 +14,12 @@ const Settings = { } }, - mongo: {}, + mongo: { + options: { + useUnifiedTopology: + (process.env.MONGO_USE_UNIFIED_TOPOLOGY || 'true') === 'true' + } + }, docstore: { backend: process.env.BACKEND || 's3',