yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-26 07:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Jim LAURIE 2018-01-23 14:49:00 +01:00 committed by GitHub
commit 66c516a7d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/strapi-mongoose/lib/index.js
View File

@ -43,11 +43,14 @@ module.exports = function (strapi) {
const { host, port, username, password, database } = _.defaults(connection.settings, strapi.config.hook.settings.mongoose); const { host, port, username, password, database } = _.defaults(connection.settings, strapi.config.hook.settings.mongoose);
// Connect to mongo database // Connect to mongo database
if (_.isEmpty(username) || _.isEmpty(password)) { const connectOptions = {}
instance.connect(`mongodb://${host}:${port}/${database}`); if (!_.isEmpty(username)) {
} else { connectOptions.user = username
instance.connect(`mongodb://${username}:${password}@${host}:${port}/${database}`); if (!_.isEmpty(password)) {
connectOptions.pass = password
} }
}
instance.connect(`mongodb://${host}:${port}/${database}`, connectOptions);
// Handle error // Handle error
instance.connection.on('error', error => { instance.connection.on('error', error => {

10
packages/strapi-mongoose/lib/utils/connectivity.js
View File

@ -10,7 +10,15 @@ const logger = require('strapi-utils').logger;
module.exports = (scope, success, error) => { module.exports = (scope, success, error) => {
const Mongoose = require(path.resolve(`${scope.rootPath}/node_modules/mongoose`)); const Mongoose = require(path.resolve(`${scope.rootPath}/node_modules/mongoose`));
Mongoose.connect(`mongodb://${ (scope.database.settings.username && scope.database.settings.password) ? `${scope.database.settings.username}:${scope.database.settings.password}@` : '' }${scope.database.settings.host}:${scope.database.settings.port}/${scope.database.settings.database}`, function (err) { const { username, password } = scope.database.settings
const connectOptions = {}
if (username) {
connectOptions.user = username
if (password) {
connectOptions.pass = password
}
}
Mongoose.connect(`mongodb://${scope.database.settings.host}:${scope.database.settings.port}/${scope.database.settings.database}`, connectOptions, function (err) {
if (err) { if (err) {
logger.warn('Database connection has failed! Make sure your database is running.'); logger.warn('Database connection has failed! Make sure your database is running.');
return error(); return error();