address connection issue #92

hapijs · Oct 9, 2018 · adfe8e0 · adfe8e0
1 parent 3571b07
commit adfe8e0
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -15,9 +15,12 @@ exports = module.exports = class Connection {
         Hoek.assert(this instanceof Connection, 'Redis cache client must be instantiated using new');
 
         this.client = null;
-        this.settings = Object.assign({}, defaults, options);
-
-        return this;
+        this.settings = Object.assign({}, defaults, options, {
+            db: options.database || options.db,
+            name: options.sentinelName,
+            tls: options.tls,
+            lazyConnect: true
+        });
     }
 
     async start() {
@@ -30,14 +33,17 @@ exports = module.exports = class Connection {
             return;
         }
 
-        const options = Object.assign({}, this.settings, {
-            db: this.settings.database || this.settings.db,
-            name: this.settings.sentinelName,
-            tls: this.settings.tls,
-            lazyConnect: true
-        });
+        let client;
 
-        const client = new Redis(options);
+        if (this.settings.url) {
+            client = new Redis(this.settings.url, this.settings);
+        }
+        else if (this.settings.socket) {
+            client = new Redis(this.settings.socket, this.settings);
+        }
+        else {
+            client = new Redis(this.settings);
+        }
 
         client.on('error', () => {