Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: redis pubsub not being required correctly

Browse Source 
split connection logic into separate module
This commit is contained in:
Barış Soner Uşaklı
2019-08-06 18:27:00 -04:00
parent 186321e646
commit 8d4f20865f
9 changed files with 239 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/database/mongo.js
View File

@@ -2,18 +2,19 @@
'use strict';
var winston = require('winston');
var async = require('async');
var nconf = require('nconf');
var session = require('express-session');
var _ = require('lodash');
var semver = require('semver');
var prompt = require('prompt');
var utils = require('../utils');
const winston = require('winston');
const async = require('async');
const nconf = require('nconf');
const session = require('express-session');
const semver = require('semver');
const prompt = require('prompt');
const utils = require('../utils');
let client;
var mongoModule = module.exports;
const connection = require('./mongo/connection');
const mongoModule = module.exports;
function isUriNotSpecified() {
return !prompt.history('mongo:uri').value;
@@ -60,58 +61,10 @@ mongoModule.questions = [
},
];
mongoModule.getConnectionString = function (mongo) {
mongo = mongo || nconf.get('mongo');
var usernamePassword = '';
var uri = mongo.uri || '';
if (mongo.username && mongo.password) {
usernamePassword = nconf.get('mongo:username') + ':' + encodeURIComponent(nconf.get('mongo:password')) + '@';
} else if (!uri.includes('@') || !uri.slice(uri.indexOf('://') + 3, uri.indexOf('@'))) {
winston.warn('You have no mongo username/password setup!');
}
// Sensible defaults for Mongo, if not set
if (!mongo.host) {
mongo.host = '127.0.0.1';
}
if (!mongo.port) {
mongo.port = 27017;
}
const dbName = mongo.database;
if (dbName === undefined || dbName === '') {
winston.warn('You have no database name, using "nodebb"');
mongo.database = 'nodebb';
}
var hosts = mongo.host.split(',');
var ports = mongo.port.toString().split(',');
var servers = [];
for (var i = 0; i < hosts.length; i += 1) {
servers.push(hosts[i] + ':' + ports[i]);
}
return uri || 'mongodb://' + usernamePassword + servers.join() + '/' + mongo.database;
};
mongoModule.getConnectionOptions = function (mongo) {
mongo = mongo || nconf.get('mongo');
var connOptions = {
poolSize: 10,
reconnectTries: 3600,
reconnectInterval: 1000,
autoReconnect: true,
connectTimeoutMS: 90000,
useNewUrlParser: true,
};
return _.merge(connOptions, mongo.options || {});
};
mongoModule.init = function (callback) {
callback = callback || function () { };
mongoModule.connect(nconf.get('mongo'), function (err, _client) {
connection.connect(nconf.get('mongo'), function (err, _client) {
if (err) {
winston.error('NodeBB could not connect to your Mongo database. Mongo returned the following error', err);
return callback(err);
@@ -122,19 +75,8 @@ mongoModule.init = function (callback) {
});
};
mongoModule.connect = function (options, callback) {
callback = callback || function () { };
var mongoClient = require('mongodb').MongoClient;
var connString = mongoModule.getConnectionString(options);
var connOptions = mongoModule.getConnectionOptions(options);
mongoClient.connect(connString, connOptions, callback);
};
mongoModule.createSessionStore = function (options, callback) {
mongoModule.connect(options, function (err, client) {
connection.connect(options, function (err, client) {
if (err) {
return callback(err);
}
@@ -193,7 +135,7 @@ mongoModule.info = function (db, callback) {
if (db) {
return setImmediate(next, null, db);
}
mongoModule.connect(nconf.get('mongo'), function (err, client) {
connection.connect(nconf.get('mongo'), function (err, client) {
next(err, client ? client.db() : undefined);
});
},
@@ -278,7 +220,7 @@ mongoModule.close = function (callback) {
mongoModule.socketAdapter = function () {
var mongoAdapter = require('socket.io-adapter-mongo');
return mongoAdapter(mongoModule.getConnectionString());
return mongoAdapter(connection.getConnectionString());
};
require('./mongo/main')(mongoModule);