Skip to content

Update MongoDB Connection #3258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Update MongoDB Connection #3258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abc915b
remove default options
raclim Oct 23, 2024
9041dce
convert mongo connection to async/await
raclim Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions server/migrations/emailConsolidation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ const mongoConnectionString = process.env.MONGO_URL;
const { ObjectId } = mongoose.Types;
// Connect to MongoDB
mongoose.Promise = global.Promise;
mongoose.connect(mongoConnectionString, {
useNewUrlParser: true,
useUnifiedTopology: true
});
mongoose.connect(mongoConnectionString);
mongoose.set('strictQuery', true);
mongoose.connection.on('error', () => {
console.error(
Expand Down
2 changes: 0 additions & 2 deletions server/previewServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ 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
});
Expand Down
5 changes: 1 addition & 4 deletions server/scripts/examples-gg-latest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };

const mongoConnectionString = process.env.MONGO_URL;

mongoose.connect(mongoConnectionString, {
useNewUrlParser: true,
useUnifiedTopology: true
});
mongoose.connect(mongoConnectionString);
mongoose.set('strictQuery', true);
mongoose.connection.on('error', () => {
console.error(
Expand Down
5 changes: 1 addition & 4 deletions server/scripts/examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };

const mongoConnectionString = process.env.MONGO_URL;

mongoose.connect(mongoConnectionString, {
useNewUrlParser: true,
useUnifiedTopology: true
});
mongoose.connect(mongoConnectionString);
mongoose.set('strictQuery', true);
mongoose.connection.on('error', () => {
console.error(
Expand Down
24 changes: 14 additions & 10 deletions server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,19 @@ app.use(cookieParser());

mongoose.set('strictQuery', true);

const clientPromise = mongoose
.connect(mongoConnectionString, {
useNewUrlParser: true,
useUnifiedTopology: true,
serverSelectionTimeoutMS: 30000, // 30 seconds timeout
socketTimeoutMS: 45000 // 45 seconds timeout
})
.then((m) => m.connection.getClient());
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();

app.use(
session({
Expand All @@ -97,8 +102,7 @@ app.use(
secure: false
},
store: new MongoStore({
clientPromise,
autoReconnect: true
clientPromise: clientInstancePromise
})
})
);
Expand Down
Loading