diff --git a/api/routes/file.js b/api/routes/file.js index 06b0139..20b92db 100644 --- a/api/routes/file.js +++ b/api/routes/file.js @@ -2,7 +2,7 @@ import path from 'path'; import fs from 'fs'; import crypto from 'crypto'; import gm from 'gm'; -import redis from 'redis-url'; +import redis from 'redis'; import parse from 'co-busboy'; import { upload as s3Upload } from '../../lib/s3'; import { sniff } from '../../lib/type'; @@ -260,7 +260,7 @@ export function* del() { export function* events() { - const pubsub = redis.connect(redisUrl); + const pubsub = redis.createClient(redisUrl); pubsub.on('ready', () => { pubsub.subscribe(this.path); }); diff --git a/api/routes/user.js b/api/routes/user.js index 389f67a..e71dd6d 100644 --- a/api/routes/user.js +++ b/api/routes/user.js @@ -1,5 +1,5 @@ import uuid from 'node-uuid'; -import redis from 'redis-url'; +import redis from 'redis'; import co from 'co'; import passwords from 'passwords'; @@ -56,7 +56,7 @@ export function* settings() { } export function* events() { - const pubsub = redis.connect(redisUrl); + const pubsub = redis.createClient(redisUrl); pubsub.on('message', (channel, message) => { this.websocket.send(message); }); diff --git a/lib/redis.js b/lib/redis.js index 94b6e84..50c9b8c 100644 --- a/lib/redis.js +++ b/lib/redis.js @@ -1,15 +1,13 @@ -import redis from 'redis-url'; +import redis from 'redis'; import coRedis from 'co-redis'; import koaRedis from 'koa-redis'; import session from 'koa-generic-session'; import debugname from 'debug'; const debug = debugname('hostr:redis'); -const redisUrl = process.env.REDIS_URL; - const connection = new Promise((resolve, reject) => { debug('Connecting to Redis'); - const client = redis.connect(redisUrl); + const client = redis.createClient(process.env.REDIS_URL); client.on('error', reject); resolve(client); }).catch((err) => { diff --git a/package.json b/package.json index 936672b..7e2a658 100644 --- a/package.json +++ b/package.json @@ -60,8 +60,7 @@ "node-uuid": "~1.4.3", "passwords": "~1.3.0", "raven": "~0.8.1", - "redis": "~0.12.1", - "redis-url": "~1.2.1", + "redis": "~1.0.0", "s3-upload-stream": "~1.0.7", "statsy": "~0.2.0", "stripe": "~3.7.1",