chore: fix bad merge
This commit is contained in:
@@ -29,36 +29,35 @@ const connectMongoose = async (
|
||||
const { MongoMemoryServer } = require('mongodb-memory-server');
|
||||
const getPort = require('get-port');
|
||||
|
||||
const port = await getPort();
|
||||
mongoMemoryServer = await MongoMemoryServer.create({
|
||||
instance: {
|
||||
dbName: connection.name,
|
||||
port,
|
||||
},
|
||||
});
|
||||
const port = await getPort();
|
||||
mongoMemoryServer = await MongoMemoryServer.create({
|
||||
instance: {
|
||||
dbName: connection.name,
|
||||
port,
|
||||
},
|
||||
});
|
||||
|
||||
urlToConnect = mongoMemoryServer.getUri();
|
||||
successfulConnectionMessage = 'Connected to in-memory MongoDB server successfully!';
|
||||
}
|
||||
|
||||
try {
|
||||
await mongoose.connect(urlToConnect, connectionOptions);
|
||||
|
||||
if (process.env.PAYLOAD_DROP_DATABASE === 'true') {
|
||||
logger.info('---- DROPPING DATABASE ----');
|
||||
await mongoose.connection.dropDatabase();
|
||||
logger.info('---- DROPPED DATABASE ----');
|
||||
urlToConnect = mongoMemoryServer.getUri();
|
||||
successfulConnectionMessage = 'Connected to in-memory MongoDB server successfully!';
|
||||
}
|
||||
logger.info(successfulConnectionMessage);
|
||||
} catch (err) {
|
||||
logger.error(
|
||||
`Error: cannot connect to MongoDB. Details: ${err.message}`,
|
||||
err,
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
try {
|
||||
await mongoose.connect(urlToConnect, connectionOptions);
|
||||
|
||||
if (process.env.PAYLOAD_DROP_DATABASE === 'true') {
|
||||
logger.info('---- DROPPING DATABASE ----');
|
||||
await mongoose.connection.dropDatabase();
|
||||
logger.info('---- DROPPED DATABASE ----');
|
||||
}
|
||||
logger.info(successfulConnectionMessage);
|
||||
} catch (err) {
|
||||
logger.error(
|
||||
`Error: cannot connect to MongoDB. Details: ${err.message}`,
|
||||
err,
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
return mongoMemoryServer;
|
||||
};
|
||||
|
||||
export default connectMongoose;
|
||||
|
||||
Reference in New Issue
Block a user