fixing nconf issue where redis js was requiring redis configs before they were defined

v1.18.x
Julian Lam 12 years ago
parent 4d11fba20a
commit aeebd069e2

@ -16,18 +16,20 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. 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'), var fs = require('fs'),
winston = require('winston'), winston = require('winston'),
pkg = require('./package.json'), pkg = require('./package.json'),
url = require('url'), url = require('url'),
meta = require('./src/meta.js'); meta = require('./src/meta.js');
nconf = require('nconf');
// Runtime environment // Runtime environment
global.env = process.env.NODE_ENV || 'production', global.env = process.env.NODE_ENV || 'production',
// Configuration setup
nconf.argv().file({ file: __dirname + '/config.json'});
winston.remove(winston.transports.Console); winston.remove(winston.transports.Console);
winston.add(winston.transports.Console, { winston.add(winston.transports.Console, {

@ -3,7 +3,7 @@
nconf = require('nconf'), nconf = require('nconf'),
utils = require('./../public/src/utils.js'), utils = require('./../public/src/utils.js'),
winston = require('winston'); winston = require('winston');
RedisDB.exports = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host')); RedisDB.exports = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
if(nconf.get('redis:password')) { if(nconf.get('redis:password')) {
@ -40,7 +40,7 @@
RedisDB.exports.hmget(key, fields, function(err, data) { RedisDB.exports.hmget(key, fields, function(err, data) {
if(err === null) { if(err === null) {
var returnData = {}; var returnData = {};
for(var i=0, ii=fields.length; i<ii; ++i) { for(var i=0, ii=fields.length; i<ii; ++i) {
returnData[fields[i]] = data[i]; returnData[fields[i]] = data[i];
} }
@ -51,8 +51,8 @@
console.log(err); console.log(err);
callback(err, null); callback(err, null);
} }
}); });
} }

Loading…
Cancel
Save