Merge pull request #13 from InternetMaximalism/tls

fix redis

Author: signature18632

packages/shared/src/lib/queue.ts

@@ -28,8 +28,9 @@ export class QueueManager {
   };
 
   constructor(queueName: QueueNameType, options?: QueueOptions) {
+    const redisUrl = this.getRedisURL();
     const defaultOptions: QueueOptions = {};
-    this.queue = new Queue<QueueJobData>(queueName, config.REDIS_URL, {
+    this.queue = new Queue<QueueJobData>(queueName, redisUrl, {
       ...defaultOptions,
       ...options,
     });
@@ -47,6 +48,16 @@ export class QueueManager {
     });
   }
 
+  private getRedisURL(): string {
+    const hasQueryParams = config.REDIS_URL.includes("?");
+
+    if (config.REDIS_URL.includes("rediss")) {
+      return hasQueryParams ? `${config.REDIS_URL}&tls=true` : `${config.REDIS_URL}?tls=true`;
+    }
+
+    return config.REDIS_URL;
+  }
+
   public static getInstance(queueName: QueueNameType) {
     if (!QueueManager.instance) {
       QueueManager.instance = new QueueManager(queueName);

packages/shared/src/lib/redis.ts

@@ -11,9 +11,7 @@ export class RedisClient {
       return;
     }
 
-    const redisUrl = this.getRedisURL();
-
-    this.client = new Redis(redisUrl, {
+    this.client = new Redis(config.REDIS_URL, {
       reconnectOnError: (err) => {
         const targetError = "READONLY";
         if (err.message.includes(targetError)) {
@@ -32,16 +30,6 @@ export class RedisClient {
     });
   }
 
-  private getRedisURL(): string {
-    const hasQueryParams = config.REDIS_URL.includes("?");
-
-    if (config.REDIS_URL.includes("rediss")) {
-      return hasQueryParams ? `${config.REDIS_URL}&tls=true` : `${config.REDIS_URL}?tls=true`;
-    }
-
-    return config.REDIS_URL;
-  }
-
   public static getInstance(): RedisClient {
     if (!RedisClient.instance) {
       RedisClient.instance = new RedisClient();