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

#631

Browse Source
This commit is contained in:
Baris Usakli
2013-12-09 14:16:04 -05:00
parent 27ac24b1e3
commit 0000a7f0b9
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@@ -14,14 +14,10 @@
}, },
"dependencies": { "dependencies": {
"socket.io": "~0.9.16", "socket.io": "~0.9.16",
"redis": "0.8.3",
"mongodb": "~1.3.19",
"express": "3.2.0", "express": "3.2.0",
"express-namespace": "~0.1.1", "express-namespace": "~0.1.1",
"emailjs": "0.3.4", "emailjs": "0.3.4",
"cookie": "0.0.6", "cookie": "0.0.6",
"connect-redis": "1.4.5",
"connect-mongo": "0.4.0",
"passport": "0.1.17", "passport": "0.1.17",
"passport-local": "0.1.6", "passport-local": "0.1.6",
"passport-twitter": "0.1.5", "passport-twitter": "0.1.5",
@@ -50,6 +46,10 @@
"semver": "~2.2.1" "semver": "~2.2.1"
}, },
"optionalDependencies": { "optionalDependencies": {
"redis": "0.8.3",
"mongodb": "~1.3.19",
"connect-redis": "1.4.5",
"connect-mongo": "0.4.0",
"hiredis": "~0.1.15" "hiredis": "~0.1.15"
}, },
"devDependencies": { "devDependencies": {

20
src/database/mongo.js
View File

@@ -2,17 +2,25 @@
(function(module) { (function(module) {
'use strict'; 'use strict';
var mongoClient = require('mongodb').MongoClient, var winston = require('winston'),
winston = require('winston'),
async = require('async'), async = require('async'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'), express = require('express'),
mongoStore = require('connect-mongo')(express), db,
mongoHost = nconf.get('mongo:host'), mongoClient,
db; mongoStore;
try {
mongoClient = require('mongodb').MongoClient;
mongoStore = require('connect-mongo')(express);
} catch (err) {
winston.error('Unable to initialize mongo! ' + err.message);
process.exit();
}
module.init = function(callback) { module.init = function(callback) {
mongoClient.connect('mongodb://'+ mongoHost + ':' + nconf.get('mongo:port') + '/' + nconf.get('mongo:database'), function(err, _db) { mongoClient.connect('mongodb://'+ nconf.get('mongo:host') + ':' + nconf.get('mongo:port') + '/' + nconf.get('mongo:database'), function(err, _db) {
if(err) { if(err) {
winston.error("NodeBB could not connect to your Mongo database. Mongo returned the following error: " + err.message); winston.error("NodeBB could not connect to your Mongo database. Mongo returned the following error: " + err.message);
process.exit(); process.exit();

22
src/database/redis.js
View File

@@ -2,16 +2,24 @@
(function(module) { (function(module) {
'use strict'; 'use strict';
var redisClient, var winston = require('winston'),
redis = require('redis'),
winston = require('winston'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'), express = require('express'),
connectRedis = require('connect-redis')(express),
reds = require('reds'),
redis_socket_or_host = nconf.get('redis:host'), redis_socket_or_host = nconf.get('redis:host'),
utils = require('./../../public/src/utils.js'); utils = require('./../../public/src/utils.js'),
redis,
connectRedis,
reds,
redisClient;
try {
redis = require('redis');
connectRedis = require('connect-redis')(express);
reds = require('reds');
} catch (err) {
winston.error('Unable to initialize redis! ' + err.message);
process.exit();
}
if (redis_socket_or_host && redis_socket_or_host.indexOf('/')>=0) { if (redis_socket_or_host && redis_socket_or_host.indexOf('/')>=0) {