From 43db2289c2d38b64d9ebf8790bbc8d06f6a552de Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 30 Sep 2014 23:57:03 -0400
Subject: [PATCH] moving db selection into db.connect, where it should be

---
 src/database/redis.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/database/redis.js b/src/database/redis.js
index 8487e363d3..8e0cea9af2 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -63,17 +63,6 @@
 		module.postSearch = reds.createSearch('nodebbpostsearch');
 		module.topicSearch = reds.createSearch('nodebbtopicsearch');
 
-		var db = parseInt(nconf.get('redis:database'), 10);
-
-		if (db) {
-			redisClient.select(db, function(error) {
-				if(error) {
-					winston.error("NodeBB could not connect to your Redis database. Redis returned the following error: " + error.message);
-					process.exit();
-				}
-			});
-		}
-
 		require('./redis/main')(redisClient, module);
 		require('./redis/hash')(redisClient, module);
 		require('./redis/sets')(redisClient, module);
@@ -87,7 +76,7 @@
 
 	module.connect = function() {
 		var redis_socket_or_host = nconf.get('redis:host'),
-			cxn;
+			cxn, dbIdx;
 
 		if (!redis) redis = require('redis');
 
@@ -103,6 +92,17 @@
 			cxn.auth(nconf.get('redis:password'));
 		}
 
+		dbIdx = parseInt(nconf.get('redis:database'), 10);
+		if (dbIdx) {
+			console.log('SELECTING dbIdxBBBBBB', dbIdx);
+			cxn.select(dbIdx, function(error) {
+				if(error) {
+					winston.error("NodeBB could not connect to your Redis database. Redis returned the following error: " + error.message);
+					process.exit();
+				}
+			});
+		}
+
 		cxn.on('error', function (err) {
 			winston.error(err.stack);
 			process.exit(1);