From aeebd069e2eec7322f4ade97e9c1028175033e3e Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 23 Aug 2013 16:25:16 -0400
Subject: [PATCH] fixing nconf issue where redis js was requiring redis configs
 before they were defined

---
 app.js       | 8 +++++---
 src/redis.js | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 8a7603b045..44011f8882 100644
--- a/app.js
+++ b/app.js
@@ -16,18 +16,20 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+// Configuration setup
+nconf = require('nconf');
+nconf.argv().file({ file: __dirname + '/config.json'});
+
 var fs = require('fs'),
 	winston = require('winston'),
 	pkg = require('./package.json'),
 	url = require('url'),
 	meta = require('./src/meta.js');
 
-nconf = require('nconf');
 // Runtime environment
 global.env = process.env.NODE_ENV || 'production',
 
-// Configuration setup
-nconf.argv().file({ file: __dirname + '/config.json'});
+
 
 winston.remove(winston.transports.Console);
 winston.add(winston.transports.Console, {
diff --git a/src/redis.js b/src/redis.js
index e2d5615421..1d8d41bf2e 100644
--- a/src/redis.js
+++ b/src/redis.js
@@ -3,7 +3,7 @@
 		nconf = require('nconf'),
 		utils = require('./../public/src/utils.js'),
 		winston = require('winston');
-	
+
 	RedisDB.exports = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
 
 	if(nconf.get('redis:password')) {
@@ -40,7 +40,7 @@
 		RedisDB.exports.hmget(key, fields, function(err, data) {
 			if(err === null) {
 				var returnData = {};
-				
+
 				for(var i=0, ii=fields.length; i<ii; ++i) {
 					returnData[fields[i]] = data[i];
 				}
@@ -51,8 +51,8 @@
 				console.log(err);
 				callback(err, null);
 			}
-		});		
-	}	
+		});
+	}