Merge pull request typeorm#3364 from ignacioblit/enchancement/ioredis…

…-cluster-support Enchancement - Add support for ioredis Cluster object initialization
loyaltylion · Jan 7, 2019 · 3bd211c · 3bd211c
2 parents 5a651c0 + ca5a833
commit 3bd211c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/cache/QueryResultCacheFactory.ts b/src/cache/QueryResultCacheFactory.ts
@@ -32,8 +32,10 @@ export class QueryResultCacheFactory {
         if ((this.connection.options.cache as any).type === "ioredis")
             return new RedisQueryResultCache(this.connection, "ioredis");
 
+        if ((this.connection.options.cache as any).type === "ioredis/cluster")
+            return new RedisQueryResultCache(this.connection, "ioredis/cluster");
+
         return new DbQueryResultCache(this.connection);
     }
 
-
 }
diff --git a/src/cache/RedisQueryResultCache.ts b/src/cache/RedisQueryResultCache.ts
@@ -26,13 +26,13 @@ export class RedisQueryResultCache implements QueryResultCache {
     /**
      * Type of the Redis Client (redis or ioredis).
      */
-    protected clientType: "redis" | "ioredis";
+    protected clientType: "redis" | "ioredis" | "ioredis/cluster";
 
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
 
-    constructor(protected connection: Connection, clientType: "redis" | "ioredis") {
+    constructor(protected connection: Connection, clientType: "redis" | "ioredis" | "ioredis/cluster") {
         this.clientType = clientType;
         this.redis = this.loadRedis();
     }
@@ -61,6 +61,13 @@ export class RedisQueryResultCache implements QueryResultCache {
                 this.client = new this.redis();
             }
 
+        } else if (this.clientType === "ioredis/cluster") {
+            if (cacheOptions && cacheOptions.options) {
+                this.client = new this.redis.Cluster(cacheOptions.options);
+            } else {
+                throw new Error(`Options required for ${this.clientType}.`);
+            }
+
         }
     }
 

diff --git a/src/connection/BaseConnectionOptions.ts b/src/connection/BaseConnectionOptions.ts
@@ -114,7 +114,7 @@ export interface BaseConnectionOptions {
          * - "database" means cached values will be stored in the separate table in database. This is default value.
          * - "redis" means cached values will be stored inside redis. You must provide redis connection options.
          */
-        readonly type?: "database"|"redis"; // todo: add mongodb and other cache providers as well in the future
+        readonly type?: "database" | "redis" | "ioredis" | "ioredis/cluster"; // todo: add mongodb and other cache providers as well in the future
 
         /**
          * Used to provide redis connection options.

diff --git a/src/platform/PlatformTools.ts b/src/platform/PlatformTools.ts
@@ -83,6 +83,7 @@ export class PlatformTools {
                  * ioredis
                  */
                 case "ioredis":
+                case "ioredis/cluster":
                     return require("ioredis");
 
                 /**