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

cleanup mongo init

Browse Source
This commit is contained in:
Baris Usakli
2013-12-06 14:34:25 -05:00
parent 351b07bb34
commit 400845ce6c
2 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/database/mongo.js
View File

@@ -13,13 +13,13 @@
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://'+ mongoHost + ':' + nconf.get('mongo:port') + '/' + nconf.get('mongo:database'), function(err, _db) {
db = _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();
} }
db = _db;
module.client = db; module.client = db;
module.sessionStore = new mongoStore({ module.sessionStore = new mongoStore({
@@ -27,46 +27,49 @@
}); });
// TODO : what is the db user name??
if(nconf.get('mongo:password') && nconf.get('mongo:username')) { if(nconf.get('mongo:password') && nconf.get('mongo:username')) {
db.authenticate(nconf.get('mongo:username'), nconf.get('mongo:password'), function (err) { db.authenticate(nconf.get('mongo:username'), nconf.get('mongo:password'), function (err) {
if(err) { if(err) {
winston.error(err.message); winston.error(err.message);
process.exit();
} }
process.exit(); createCollections();
}); });
} else {
createCollections();
} }
function createCollections() {
db.createCollection('objects', function(err, collection) {
if(err) {
winston.error("Error creating collection " + err.message);
return;
}
if(collection) {
collection.ensureIndex({_key :1, setName:1}, {background:true}, function(err, name){
if(err) {
winston.error("Error creating index " + err.message);
}
});
}
});
db.createCollection('objects', function(err, collection) { db.createCollection('search', function(err, collection) {
if(err) { if(err) {
winston.error("Error creating collection " + err.message); winston.error("Error creating collection " + err.message);
return; return;
} }
if(collection) { if(collection) {
collection.ensureIndex({_key :1, setName:1}, {background:true}, function(err, name){ collection.ensureIndex({content:'text'}, {background:true}, function(err, name){
if(err) { if(err) {
winston.error("Error creating index " + err.message); winston.error("Error creating index " + err.message);
} }
}); });
} }
}); });
db.createCollection('search', function(err, collection) { callback(null);
if(err) { }
winston.error("Error creating collection " + err.message);
return;
}
if(collection) {
collection.ensureIndex({content:'text'}, {background:true}, function(err, name){
if(err) {
winston.error("Error creating index " + err.message);
}
});
}
});
callback(err);
}); });
} }

1
src/upgrade.js
View File

@@ -309,7 +309,6 @@ Upgrade.upgradeMongo = function(callback) {
async.series([ async.series([
function(next) { function(next) {
db.get('schemaDate', function(err, value) { db.get('schemaDate', function(err, value) {
console.log(schemaDate)
schemaDate = value; schemaDate = value;
thisSchemaDate = new Date(2013, 11, 6).getTime(); thisSchemaDate = new Date(2013, 11, 6).getTime();
next(); next();