diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 6892c82f..b0c5df69 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -604,7 +604,7 @@ module.exports.restartServer = function (req, res) const listOrphanResourcesAux = function (callback) { - let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName); + let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName, Config.mongoDBAuth.username, Config.mongoDBAuth.password); mongoClient.connect(function (err, mongoDb) { if (isNull(err) && !isNull(mongoDb)) diff --git a/src/kb/mongo.js b/src/kb/mongo.js index fa9ac141..3b3e0c6f 100644 --- a/src/kb/mongo.js +++ b/src/kb/mongo.js @@ -3,6 +3,7 @@ const slug = rlequire("dendro", "src/utils/slugifier.js"); const isNull = rlequire("dendro", "src/utils/null.js").isNull; const MongoClient = require("mongodb").MongoClient; +const Logger = rlequire("dendro", "src/utils/logger.js").Logger; function DendroMongoClient (mongoDBHost, mongoDbPort, mongoDbCollectionName, mongoDbUsername, mongoDbPassword) { @@ -29,6 +30,7 @@ DendroMongoClient.prototype.connect = function (callback) url = "mongodb://" + self.host + ":" + self.port + "/" + self.collectionName; } + Logger.log("debug", "Connecting to MongoDB using connection string: " + url); MongoClient.connect(url, function (err, db) { if (!err) @@ -49,7 +51,7 @@ DendroMongoClient.prototype.findFileByFilenameOrderedByDate = function (db, file { return callback(null, files); } - const msg = "Error findind document with uri: " + fileUri + " in Mongo error: " + JSON.stringify(err); + const msg = "Error finding document with uri: " + fileUri + " in Mongo. error: " + JSON.stringify(err); return callback(true, msg); }); }; @@ -64,7 +66,7 @@ DendroMongoClient.prototype.getNonAvatarNorThumbnailFiles = function (db, callba { return callback(null, files); } - const msg = "Error when looking for non Avatar nor thumbnail files in Mongo, error: " + JSON.stringify(err); + const msg = "Error when looking for non Avatar nor thumbnail files in Mongo. error: " + JSON.stringify(err); return callback(true, msg); }); }; diff --git a/src/models/user.js b/src/models/user.js index c3f6041a..8f94cab4 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -1222,7 +1222,7 @@ User.prototype.saveAvatarInGridFS = function (avatar, extension, callback) let avatarUri = "/avatar/" + self.ddr.username + "/avatar." + extension; let base64Data = avatar.replace(/^data:image\/png;base64,/, ""); - let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName); + let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName, Config.mongoDBAuth.username, Config.mongoDBAuth.password); mongoClient.connect(function (err, mongoDb) { diff --git a/test/routes/admin/list_orphan_resources/routes.admin.listOrphanResources.Test.js b/test/routes/admin/list_orphan_resources/routes.admin.listOrphanResources.Test.js index a57fcd14..5fcb3c66 100644 --- a/test/routes/admin/list_orphan_resources/routes.admin.listOrphanResources.Test.js +++ b/test/routes/admin/list_orphan_resources/routes.admin.listOrphanResources.Test.js @@ -33,7 +33,7 @@ let agent; checkFileExistsInGridFs = function (fileUri, callback) { const DendroMongoClient = rlequire("dendro", "src/kb/mongo.js").DendroMongoClient; - let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName); + let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName, Config.mongoDBAuth.username, Config.mongoDBAuth.password); mongoClient.connect(function (err, mongoDb) { if (isNull(err) && !isNull(mongoDb)) diff --git a/test/routes/admin/nuke_orphan_resources/routes.admin.nukeOrphanResources.Test.js b/test/routes/admin/nuke_orphan_resources/routes.admin.nukeOrphanResources.Test.js index e344b8ab..dc8521a5 100644 --- a/test/routes/admin/nuke_orphan_resources/routes.admin.nukeOrphanResources.Test.js +++ b/test/routes/admin/nuke_orphan_resources/routes.admin.nukeOrphanResources.Test.js @@ -33,7 +33,7 @@ let agent; checkFileExistsInGridFs = function (fileUri, callback) { const DendroMongoClient = rlequire("dendro", "src/kb/mongo.js").DendroMongoClient; - let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName); + let mongoClient = new DendroMongoClient(Config.mongoDBHost, Config.mongoDbPort, Config.mongoDbCollectionName, Config.mongoDBAuth.username, Config.mongoDBAuth.password); mongoClient.connect(function (err, mongoDb) { if (isNull(err) && !isNull(mongoDb))