Merge pull request #3265 from processing/revert-3258-mongodb-connection

Revert 3258 mongodb connection

Author: raclim

Diff for: server/migrations/emailConsolidation.js

@@ -14,7 +14,10 @@ const mongoConnectionString = process.env.MONGO_URL;
 const { ObjectId } = mongoose.Types;
 // Connect to MongoDB
 mongoose.Promise = global.Promise;
-mongoose.connect(mongoConnectionString);
+mongoose.connect(mongoConnectionString, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+});
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

Diff for: server/previewServer.js

@@ -22,6 +22,8 @@ const connectToMongoDB = async () => {
     mongoose.set('strictQuery', true);
 
     await mongoose.connect(mongoConnectionString, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
       serverSelectionTimeoutMS: 30000, // 30 seconds timeout
       socketTimeoutMS: 45000 // 45 seconds timeout
     });

Diff for: server/scripts/examples-gg-latest.js

@@ -59,7 +59,10 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString);
+mongoose.connect(mongoConnectionString, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+});
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

Diff for: server/scripts/examples.js

@@ -14,7 +14,10 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString);
+mongoose.connect(mongoConnectionString, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+});
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

Diff for: server/server.js

@@ -76,19 +76,14 @@ app.use(cookieParser());
 
 mongoose.set('strictQuery', true);
 
-async function connectToMongoDB() {
-  try {
-    const mongooseConnection = await mongoose.connect(mongoConnectionString, {
-      serverSelectionTimeoutMS: 30000, // 30 seconds timeout
-      socketTimeoutMS: 45000 // 45 seconds timeout
-    });
-    return mongooseConnection.connection.getClient();
-  } catch (err) {
-    throw new Error('MongoDB connection failed', err);
-  }
-}
-
-const clientInstancePromise = connectToMongoDB();
+const clientPromise = mongoose
+  .connect(mongoConnectionString, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    serverSelectionTimeoutMS: 30000, // 30 seconds timeout
+    socketTimeoutMS: 45000 // 45 seconds timeout
+  })
+  .then((m) => m.connection.getClient());
 
 app.use(
   session({
@@ -102,7 +97,8 @@ app.use(
       secure: false
     },
     store: new MongoStore({
-      clientPromise: clientInstancePromise
+      clientPromise,
+      autoReconnect: true
     })
   })
 );