yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-29 08:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test connection in connector node module

Browse Source
This commit is contained in:
Jim Laurie 2018-01-10 15:31:54 +01:00
parent 9ace21f210
commit e1fb02ab53
4 changed files with 98 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/strapi-bookshelf/lib/utils/connectivity.js Normal file
View File

@ -0,0 +1,28 @@
'use strict';
// Node.js core.
const execSync = require('child_process').execSync;
// Logger.
const logger = require('strapi-utils').logger;
module.exports = (scope, success, error) => {
const knex = require(`${scope.rootPath}_/node_modules/knex`)({
client: scope.client.module,
connection: scope.database
});
knex.raw('select 1+1 as result').then(() => {
logger.info('Database connection is a success!');
knex.destroy();
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
success();
})
.catch(() => {
logger.warn('Database connection failed!');
error();
});
};

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

@ -174,11 +174,11 @@ module.exports = (scope, cb) => {
}
])
.then(answers => {
scope.database.host = answers.host;
scope.database.port = answers.port;
scope.database.database = answers.name;
scope.database.username = answers.username;
scope.database.password = answers.password;
scope.database.settings.host = answers.host;
scope.database.settings.port = answers.port;
scope.database.settings.database = answers.name;
scope.database.settings.username = answers.username;
scope.database.settings.password = answers.password;
logger.info('Testing database connection...');
@ -204,78 +204,13 @@ module.exports = (scope, cb) => {
Promise.all(asyncFn)
.then(() => {
if (scope.client.connector === 'strapi-bookshelf') {
const knex = require(`${scope.rootPath}_/node_modules/knex`)({
client: scope.client.module,
connection: scope.database
});
knex.raw('select 1+1 as result').then(() => {
logger.info('Database connection is a success!');
knex.destroy();
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
// Trigger callback with no error to proceed.
cb.success();
})
.catch(() => {
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}`, 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 if (scope.client.connector === 'strapi-redis') {
const Redis = require(`${scope.rootPath}_/node_modules/ioredis`);
const redis = new Redis({
port: scope.database.port,
host: scope.database.host,
password: scope.database.password,
db: scope.database.database
});
redis.connect((err) => {
redis.disconnect();
if (err) {
logger.warn('Database connection failed!');
return connectionValidation();
}
logger.info('Database connection is a success!');
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
// Trigger callback with no error to proceed.
cb.success();
});
} else {
try {
require(`${scope.rootPath}_/node_modules/${scope.client.connector}/utils/connectivity.js`)(scope, cb.success, connectionValidation);
} catch(err) {
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
// Trigger callback with no error to proceed.
cb.success();
}
});

28
packages/strapi-mongoose/lib/utils/connectivity.js Normal file
View File

@ -0,0 +1,28 @@
'use strict';
// Node.js core.
const execSync = require('child_process').execSync;
// Logger.
const logger = require('strapi-utils').logger;
module.exports = (scope, success, error) => {
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}`, function (err) {
if (err) {
logger.warn('Database connection failed!');
return error();
}
logger.info('Database connection is a success!');
Mongoose.connection.close();
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
success();
});
};

34
packages/strapi-redis/lib/utils/connectivity.js Normal file
View File

@ -0,0 +1,34 @@
'use strict';
// Node.js core.
const execSync = require('child_process').execSync;
// Logger.
const logger = require('strapi-utils').logger;
module.exports = (scope, success, error) => {
const Redis = require(`${scope.rootPath}_/node_modules/ioredis`);
const redis = new Redis({
port: scope.database.port,
host: scope.database.host,
password: scope.database.password,
db: scope.database.database
});
redis.connect((err) => {
redis.disconnect();
if (err) {
logger.warn('Database connection failed!');
return error();
}
logger.info('Database connection is a success!');
execSync(`rm -r ${scope.rootPath}_`);
logger.info('Copying the dashboard...');
success();
});
};