merge dem shiet

This commit is contained in:
jomo 2014-11-02 15:18:16 +01:00
commit b146a5ea79
2 changed files with 5 additions and 2 deletions

View File

@ -5,7 +5,7 @@ var redis = null;
function connect_redis() { function connect_redis() {
console.log("connecting to redis"); console.log("connecting to redis");
if (process.env.REDISTOGO_URL) { if (process.env.REDISTOGO_URL) {
var rtg = require("url").parse(process.env.REDISTOGO_URL); var rtg = require("url").parse(process.env.REDISTOGO_URL);
redis = require("redis").createClient(rtg.port, rtg.hostname); redis = require("redis").createClient(rtg.port, rtg.hostname);
redis.auth(rtg.auth.split(":")[1]); redis.auth(rtg.auth.split(":")[1]);
} else { } else {

View File

@ -5,7 +5,10 @@ var networking = require('../modules/networking');
var helpers = require('../modules/helpers'); var helpers = require('../modules/helpers');
var config = require('../modules/config'); var config = require('../modules/config');
var skins = require('../modules/skins'); var skins = require('../modules/skins');
var redis = require('redis').createClient(); var url = require('url');
var redisURL = url.parse(process.env.REDISCLOUD_URL);
var redis = require("redis").createClient(redisURL.port, redisURL.hostname, {no_ready_check: true});
redis.auth(redisURL.auth.split(":")[1]);
var uuids = fs.readFileSync('test/uuids.txt').toString().split("\r\n"); var uuids = fs.readFileSync('test/uuids.txt').toString().split("\r\n");
// Get a random UUID in order to prevent rate limiting // Get a random UUID in order to prevent rate limiting