Skip to content

Commit

Permalink
Merge pull request #132 from ericsandine/develop
Browse files Browse the repository at this point in the history
Allow SRV mongo Urls
  • Loading branch information
electerious committed Jul 18, 2020
2 parents 2edc9e5 + 60927dd commit 354e7df
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/index.js
@@ -1,13 +1,13 @@
#!/usr/bin/env node
'use strict'

require('dotenv').config()

const mongoose = require('mongoose')

const server = require('./server')
const signale = require('./utils/signale')
const isDemo = require('./utils/isDemo')
const isSrvUrl = require('./utils/isSrvUrl')
const fillDatabase = require('./utils/fillDatabase')
const stripUrlAuth = require('./utils/stripUrlAuth')

Expand All @@ -27,14 +27,18 @@ if (dbUrl == null) {

signale.await(`Connecting to ${ stripUrlAuth(dbUrl) }`)

mongoose.connect(dbUrl, {

const mongooseConfig = {
useNewUrlParser: true,
useCreateIndex: true,
reconnectTries: Number.MAX_VALUE,
reconnectInterval: 1000
reconnectInterval: 1000,
}

if (isSrvUrl(dbUrl)) {
mongooseConfig.useUnifiedTopology = true
};

}).then(() => {
mongoose.connect(dbUrl, mongooseConfig).then(() => {

signale.success(`Connected to ${ stripUrlAuth(dbUrl) }`)
signale.start(`Starting the server`)
Expand Down
5 changes: 5 additions & 0 deletions src/utils/isSrvUrl.js
@@ -0,0 +1,5 @@
"use strict";

module.exports = (url) => {
return url.split(":")[0].includes("srv");
};
16 changes: 16 additions & 0 deletions test/utils/isSrvUrl.js
@@ -0,0 +1,16 @@
"use strict";

const test = require("ava");

const isSrvUrl = require("../../src/utils/isSrvUrl");
const standarConnectionString = "mongodb://localhost:27017/ackee";
const srvConnectionString =
"mongodb+srv://username:badpw@cluster0-OMITTED.mongodb.net/ackee";

test("return standard connection string is false", async (t) => {
t.is(isSrvUrl(standarConnectionString), false);
});

test("return srv connection string is false", async (t) => {
t.is(isSrvUrl(srvConnectionString), true);
});

0 comments on commit 354e7df

Please sign in to comment.