yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-13 17:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle mongoose error connection

Browse Source
This commit is contained in:
Jim Laurie 2018-01-08 13:51:17 +01:00
parent 5ace081557
commit fc4e9d89fa
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/strapi-generate-new/lib/before.js
View File

@ -215,7 +215,7 @@ module.exports = (scope, cb) => {
});
knex.raw('select 1+1 as result').then(() => {
console.log('Database connection is a success!');
logger.info('Database connection is a success!');
knex.destroy();
execSync(`rm -r ${scope.rootPath}_`);
@ -225,9 +225,31 @@ module.exports = (scope, cb) => {
cb.success();
})
.catch(() => {
console.log('Database connection failed!');
logger.warn('Database connection failed!');
connectionValidation();
});
} else if (scope.client.connector === 'strapi-mongoose') {
const Mongoose = require(`${scope.rootPath}_/node_modules/mongoose`);
Mongoose.connect(`mongodb://${ (scope.database.username && scope.database.password) ? `${scope.database.username}:${scope.database.password}@` : '' }${scope.database.host}:${scope.database.port}/${scope.database.database}`, {
useMongoClient: true
}, function (err) {
if (err) {
logger.warn('Database connection failed!');
return connectionValidation();
}
logger.info('Database connection is a success!');
Mongoose.connection.close();
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
// Trigger callback with no error to proceed.
cb.success();
});
} else {
execSync(`rm -r ${scope.rootPath}_`);