github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

[misc] simplify the naming around waiting for a mongo connection

Browse source 
Co-Authored-By: Eric Mc Sween <eric.mcsween@overleaf.com>
Co-Authored-By: Miguel Serrano <mserranom@gmail.com>
Co-Authored-By: Simon Detheridge <s@sd.ai>
This commit is contained in:
Jakob Ackermann 2020-08-24 17:06:30 +01:00
parent d345911730
commit 39ea30355e
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/chat/app.js
View file

@ -23,7 +23,8 @@ if (!module.parent) {
settings.internal != null ? settings.internal.chat : undefined, settings.internal != null ? settings.internal.chat : undefined,
(x1) => x1.host (x1) => x1.host
) || 'localhost' ) || 'localhost'
mongodb.clientConnecting mongodb
.waitForDb()
.then(() => { .then(() => {
Server.server.listen(port, host, function (err) { Server.server.listen(port, host, function (err) {
if (err) { if (err) {

16
services/chat/app/js/mongodb.js
View file

@ -1,15 +1,19 @@
const Settings = require('settings-sharelatex') const Settings = require('settings-sharelatex')
const { MongoClient, ObjectId } = require('mongodb') const { MongoClient, ObjectId } = require('mongodb')
const clientConnecting = MongoClient.connect(Settings.mongo.url) const clientPromise = MongoClient.connect(Settings.mongo.url)
const dbPromise = clientConnecting.then((client) => client.db()) const dbPromise = clientPromise.then((client) => client.db())
async function getCollection(name) { async function getCollection(name) {
return (await dbPromise).collection(name) return (await dbPromise).collection(name)
} }
module.exports = { async function waitForDb() {
clientConnecting, await clientPromise
ObjectId, }
getCollection
module.exports = {
ObjectId,
getCollection,
waitForDb
} }