feathersjs
diff --git a/‎README.md‎
Lines changed: 0 additions & 2 deletions b/‎README.md‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎lib/adapters/redis.js‎
Lines changed: 14 additions & 15 deletions b/‎lib/adapters/redis.js‎
Lines changed: 14 additions & 15 deletions
@@ -119,11 +119,9 @@ app.configure(
 ### Redis
 
 - `uri` - The connection string (must start with `redis://`)
-- `db` - The Redis database object or connection string (e.g. `redis://localhost:6379`)
 - `key` - The key under which all synchronization events will be stored (default: `feathers-sync`)
 - `redisClient` - An existing instance of redisClient
 - `redisOptions` - Redis [client options](http://redis.js.org/#api-rediscreateclient)
-- `subscriberEvent` - The event to listen for. Defaults to `message`. Could be `message_buffer` or `messageBuffer` depending on what Redis library is being used.
 
 ### AMQP
 
 
@@ -4,17 +4,17 @@ const core = require('../core');
 
 module.exports = config => {
   return app => {
-    const { key, serialize, deserialize } = config;
-    const db = config.uri || config.db;
-    const { redisClient } = config;
-    // NOTE: message_buffer (redis) and messageBuffer (ioredis) return buffers
-    const subscriberEvent = config.subscriberEvent || 'message';
+    const { key, serialize, deserialize, redisClient, uri } = config;
+    const options = {
+      url: uri,
+      ...config.redisOptions
+    };
 
-    if (!redisClient && typeof db !== 'undefined') {
-      debug(`Setting up Redis client for db: ${db}`);
+    if (!redisClient) {
+      debug(`Setting up Redis client for ${options.uri}`);
     }
 
-    const pub = redisClient || redis.createClient(db, config.redisOptions);
+    const pub = redisClient || redis.createClient(options);
     const sub = pub.duplicate();
 
     app.configure(core);
@@ -25,6 +25,8 @@ module.exports = config => {
       sub,
       type: 'redis',
       ready: new Promise((resolve, reject) => {
+        pub.connect();
+        sub.connect();
         sub.once('ready', resolve);
         sub.once('error', reject);
       })
@@ -35,12 +37,9 @@ module.exports = config => {
       pub.publish(key, data);
     });
 
-    sub.subscribe(key);
-    sub.on(subscriberEvent, function (e, data) {
-      if (e.toString() === key) {
-        debug(`Got ${key} message from Redis`);
-        app.emit('sync-in', data);
-      }
-    });
+    sub.subscribe(key, data => {
+      debug(`Got ${key} message from Redis`);
+      app.emit('sync-in', data);
+    }, true);
   };
 };