closes #5271

src/database/mongo.js

@@ -112,12 +112,10 @@
 						return callback(err);
 					}
 					createSessionStore();					
-					createIndices();
 				});
 			} else {
 				winston.warn('You have no mongo password setup!');
 				createSessionStore();
-				createIndices();
 			}
 
 			function createSessionStore() {
@@ -137,9 +135,21 @@
 						db: db
 					});
 				}
+				callback();
+			}			
+		});
+	};
+
+	module.createIndices = function(callback) {
+		function createIndex(collection, index, options, callback) {
+			module.client.collection(collection).createIndex(index, options, callback);				
+		}
+
+		if (!module.client) {
+			winston.warn('[database/createIndices] database not initialized');
+			return callback();
 		}
 
-			function createIndices() {
 		winston.info('[database] Checking database indices.');
 		async.series([
 			async.apply(createIndex, 'objects', {_key: 1, score: -1}, {background: true}),
@@ -148,21 +158,16 @@
 		], function (err) {
 			if (err) {
 				winston.error('Error creating index ' + err.message);
+				return callback(err);
 			}
 			winston.info('[database] Checking database indices done!');
-					callback(err);
+			callback();
-				});
-			}
-
-			function createIndex(collection, index, options, callback) {
-				db.collection(collection).createIndex(index, options, callback);
-			}
 		});			
 	};
 
 	module.checkCompatibility = function (callback) {
-		var mongoPkg = require.main.require('./node_modules/mongodb/package.json'),
+		var mongoPkg = require.main.require('./node_modules/mongodb/package.json');
-			err = semver.lt(mongoPkg.version, '2.0.0') ? new Error('The `mongodb` package is out-of-date, please run `./nodebb setup` again.') : null;
+		var err = semver.lt(mongoPkg.version, '2.0.0') ? new Error('The `mongodb` package is out-of-date, please run `./nodebb setup` again.') : null;
 
 		if (err) {
 			err.stacktrace = false;

src/database/redis.js

@@ -2,13 +2,13 @@
 
 (function (module) {
 
-	var winston = require('winston'),
+	var winston = require('winston');
-		nconf = require('nconf'),
+	var nconf = require('nconf');
-		semver = require('semver'),
+	var semver = require('semver');
-		session = require('express-session'),
+	var session = require('express-session');
-		redis,
+	var redis;
-		connectRedis,
+	var connectRedis;
-		redisClient;
+	var redisClient;
 
 	module.questions = [
 		{
@@ -107,6 +107,10 @@
 		return cxn;
 	};
 
+	module.createIndices = function (callback) {
+		setImmediate(callback);
+	};
+
 	module.checkCompatibility = function (callback) {
 		module.info(module.client, function (err, info) {
 			if (err) {

src/install.js

@@ -1,16 +1,15 @@
 'use strict';
 
-var async = require('async'),
+var async = require('async');
-	fs = require('fs'),
+var fs = require('fs');
-	path = require('path'),
+var path = require('path');
-	prompt = require('prompt'),
+var prompt = require('prompt');
-	winston = require('winston'),
+var winston = require('winston');
-	nconf = require('nconf'),
+var nconf = require('nconf');
-	utils = require('../public/src/utils.js');
+var utils = require('../public/src/utils.js');
 
-
+var install = {};
-var install = {},
+var questions = {};
-	questions = {};
 
 questions.main = [
 	{
@@ -124,40 +123,33 @@ function setupConfig(next) {
 	prompt.delimiter = '';
 	prompt.colors = false;
 
-	if (!install.values) {
+	async.waterfall([
-		prompt.get(questions.main, function (err, config) {
+		function (next) {
-			if (err) {
+			if (install.values) {
-				process.stdout.write('\n\n');
-				winston.warn('NodeBB setup ' + err.message);
-				process.exit();
-			}
-
-			configureDatabases(config, function (err, config) {
-				completeConfigSetup(err, config, next);
-			});
-		});
-	} else {
 				// Use provided values, fall back to defaults
-		var	config = {},
+				var config = {};
-			redisQuestions = require('./database/redis').questions,
+				var redisQuestions = require('./database/redis').questions;
-			mongoQuestions = require('./database/mongo').questions,
+				var mongoQuestions = require('./database/mongo').questions;
-			allQuestions = questions.main.concat(questions.optional).concat(redisQuestions).concat(mongoQuestions);
+				var allQuestions = questions.main.concat(questions.optional).concat(redisQuestions).concat(mongoQuestions);
 
 				allQuestions.forEach(function (question) {
 					config[question.name] = install.values[question.name] || question['default'] || undefined;
 				});
-
+				setImmediate(next, null, config);
-		configureDatabases(config, function (err, config) {
+			} else {
-			completeConfigSetup(err, config, next);
+				prompt.get(questions.main, next);
-		});
 			}
+		},
+		function (config, next) {
+			configureDatabases(config, next);
+		},
+		function (config, next) {
+			completeConfigSetup(config, next);
+		}
+	], next);
 }
 
-function completeConfigSetup(err, config, next) {
+function completeConfigSetup(config, next) {
-	if (err) {
-		return next(err);
-	}
-
 	// Add CI object
 	if (install.ciVals) {
 		config.test_database = {};
@@ -168,13 +160,17 @@ function completeConfigSetup(err, config, next) {
 		}
 	}
 
-	install.save(config, function (err) {
+	async.waterfall([
-		if (err) {
+		function (next) {
-			return next(err);
+			install.save(config, next);
-		}
+		},
-
+		function (next) {
 			require('./database').init(next);
-	});
+		},
+		function (next) {
+			require('./database').createIndices(next);
+		}
+	], next);
 }
 
 function setupDefaultConfigs(next) {
@@ -491,7 +487,6 @@ function setCopyrightWidget(next) {
 
 install.setup = function (callback) {
 
-
 	async.series([
 		checkSetupFlag,
 		checkCIFlag,