Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 19:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix pubsub when only mongodb is used

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-05-25 11:56:40 -04:00
parent 6d155ded11
commit 8263f81d0c
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/database/mongo.js
View File

@@ -62,7 +62,7 @@ mongoModule.questions = [
mongoModule.helpers = mongoModule.helpers || {};
mongoModule.helpers.mongo = require('./mongo/helpers');
function getConnectionString() {
mongoModule.getConnectionString = function () {
var usernamePassword = '';
if (nconf.get('mongo:username') && nconf.get('mongo:password')) {
usernamePassword = nconf.get('mongo:username') + ':' + encodeURIComponent(nconf.get('mongo:password')) + '@';
@@ -90,15 +90,9 @@ function getConnectionString() {
}
return nconf.get('mongo:uri') || 'mongodb://' + usernamePassword + servers.join() + '/' + nconf.get('mongo:database');
}
mongoModule.init = function (callback) {
callback = callback || function () { };
var mongoClient = require('mongodb').MongoClient;
var connString = getConnectionString();
};
mongoModule.getConnectionOptions = function () {
var connOptions = {
poolSize: 10,
reconnectTries: 3600,
@@ -106,7 +100,16 @@ mongoModule.init = function (callback) {
autoReconnect: true,
};
connOptions = _.merge(connOptions, nconf.get('mongo:options') || {});
return _.merge(connOptions, nconf.get('mongo:options') || {});
};
mongoModule.init = function (callback) {
callback = callback || function () { };
var mongoClient = require('mongodb').MongoClient;
var connString = mongoModule.getConnectionString();
var connOptions = mongoModule.getConnectionOptions();
mongoClient.connect(connString, connOptions, function (err, _client) {
if (err) {
@@ -272,5 +275,5 @@ mongoModule.close = function (callback) {
mongoModule.socketAdapter = function () {
var mongoAdapter = require('socket.io-adapter-mongo');
return mongoAdapter(getConnectionString());
return mongoAdapter(mongoModule.getConnectionString());
};

4
src/database/mongo/pubsub.js
View File

@@ -1,8 +1,8 @@
'use strict';
var mubsub = require('mubsub');
var mubsub = require('mubsub-nbb');
var db = require('../mongo');
var client = mubsub(db.client);
var client = mubsub(db.getConnectionString(), db.getConnectionOptions());
module.exports = client.channel('pubsub');