update redis configs

Itheum · Jan 9, 2024 · 94073de · 94073de
1 parent a91a716
commit 94073de
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 28 deletions.
diff --git a/apps/api/config.ts b/apps/api/config.ts
@@ -24,7 +24,9 @@ export const config = () => ({
       },
     },
     redis: {
-      url: process.env.REDIS_URL || '127.0.0.1',
+      host: process.env.REDIS_HOST || '127.0.0.1',
+      port: parseInt(process.env.REDIS_PORT || '6379'),
+      password: process.env.REDIS_PASSWORD,
     },
   },
 })
diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -86,8 +86,9 @@ async function bootstrap() {
   const pubSubApp = await NestFactory.createMicroservice<MicroserviceOptions>(PubSubListenerModule.forRoot(config), {
     transport: Transport.REDIS,
     options: {
-      host: appConfigService.redisUrl,
-      port: 6379,
+      host: appConfigService.redisHost,
+      port: appConfigService.redisPort,
+      password: appConfigService.redisPassword || undefined,
       retryAttempts: 100,
       retryDelay: 1000,
       retryStrategy: () => 1000,

diff --git a/apps/cache-warmer/config.ts b/apps/cache-warmer/config.ts
@@ -18,7 +18,9 @@ export const config = () => ({
   },
   services: {
     redis: {
-      url: process.env.REDIS_URL || '127.0.0.1',
+      host: process.env.REDIS_HOST || '127.0.0.1',
+      port: parseInt(process.env.REDIS_PORT || '6379'),
+      password: process.env.REDIS_PASSWORD,
     },
   },
 })
diff --git a/apps/cache-warmer/src/main.ts b/apps/cache-warmer/src/main.ts
@@ -20,8 +20,9 @@ async function bootstrap() {
   const pubSubApp = await NestFactory.createMicroservice<MicroserviceOptions>(PubSubListenerModule.forRoot(config), {
     transport: Transport.REDIS,
     options: {
-      host: appConfigService.redisUrl,
-      port: 6379,
+      host: appConfigService.redisHost,
+      port: appConfigService.redisPort,
+      password: appConfigService.redisPassword || undefined,
       retryAttempts: 100,
       retryDelay: 1000,
       retryStrategy: () => 1000,

diff --git a/apps/queue-worker/config.ts b/apps/queue-worker/config.ts
@@ -15,7 +15,9 @@ export const config = () => ({
   },
   services: {
     redis: {
-      url: process.env.REDIS_URL || '127.0.0.1',
+      host: process.env.REDIS_HOST || '127.0.0.1',
+      port: parseInt(process.env.REDIS_PORT || '6379'),
+      password: process.env.REDIS_PASSWORD,
     },
   },
 })
diff --git a/apps/queue-worker/src/main.ts b/apps/queue-worker/src/main.ts
@@ -20,8 +20,9 @@ async function bootstrap() {
   const pubSubApp = await NestFactory.createMicroservice<MicroserviceOptions>(PubSubListenerModule.forRoot(config), {
     transport: Transport.REDIS,
     options: {
-      host: appConfigService.redisUrl,
-      port: 6379,
+      host: appConfigService.redisHost,
+      port: appConfigService.redisPort,
+      password: appConfigService.redisPassword || undefined,
       retryAttempts: 100,
       retryDelay: 1000,
       retryStrategy: () => 1000,

diff --git a/apps/queue-worker/src/worker/bull.queue.module.ts b/apps/queue-worker/src/worker/bull.queue.module.ts
@@ -8,8 +8,9 @@ import { AppConfigModule, AppConfigService } from '@mvx-monorepo/common'
     BullModule.forRootAsync({
       useFactory: (appConfigService: AppConfigService) => ({
         redis: {
-          host: appConfigService.redisUrl,
-          port: 6379,
+          host: appConfigService.redisHost,
+          port: appConfigService.redisPort,
+          password: appConfigService.redisPassword || undefined,
         },
       }),
       imports: [AppConfigModule.forRoot(config)],

diff --git a/apps/transactions-processor/config.ts b/apps/transactions-processor/config.ts
@@ -19,7 +19,9 @@ export const config = () => ({
       apiUrl: process.env.CHAIN_API_URL || 'https://api.multiversx.com',
     },
     redis: {
-      url: process.env.REDIS_URL || '127.0.0.1',
+      host: process.env.REDIS_HOST || '127.0.0.1',
+      port: parseInt(process.env.REDIS_PORT || '6379'),
+      password: process.env.REDIS_PASSWORD,
     },
   },
 })
diff --git a/apps/transactions-processor/src/main.ts b/apps/transactions-processor/src/main.ts
@@ -20,8 +20,9 @@ async function bootstrap() {
   const pubSubApp = await NestFactory.createMicroservice<MicroserviceOptions>(PubSubListenerModule.forRoot(config), {
     transport: Transport.REDIS,
     options: {
-      host: appConfigService.redisUrl,
-      port: 6379,
+      host: appConfigService.redisHost,
+      port: appConfigService.redisPort,
+      password: appConfigService.redisPassword || undefined,
       retryAttempts: 100,
       retryDelay: 1000,
       retryStrategy: () => 1000,

diff --git a/libs/common/src/config/app.config.service.ts b/libs/common/src/config/app.config.service.ts
@@ -28,22 +28,16 @@ export class AppConfigService {
     return this.configService.getOrThrow<string[]>('services.swagger.urls')
   }
 
-  get redisUrl(): string {
-    return this.configService.getOrThrow<string>('services.redis.url')
-  }
-
   get redisHost(): string {
-    return this.redisUrl.split(':')[0]
+    return this.configService.getOrThrow<string>('services.redis.host')
   }
 
   get redisPort(): number {
-    const components = this.redisUrl.split(':')
-
-    if (components.length > 1) {
-      return Number(components[1])
-    }
+    return this.configService.getOrThrow<number>('services.redis.port')
+  }
 
-    return 6379
+  get redisPassword(): string | null {
+    return this.configService.get<string>('services.redis.password') || null
   }
 
   get isPublicApiFeatureActive(): boolean {

diff --git a/libs/common/src/utils/dynamic.module.utils.ts b/libs/common/src/utils/dynamic.module.utils.ts
@@ -25,8 +25,9 @@ export class DynamicModuleUtils {
       useFactory: (appConfigService: AppConfigService) =>
         new RedisCacheModuleOptions(
           {
-            host: appConfigService.redisUrl,
+            host: appConfigService.redisHost,
             port: appConfigService.redisPort,
+            password: appConfigService.redisPassword || undefined,
           },
           {
             poolLimit: appConfigService.poolLimit,
@@ -65,8 +66,9 @@ export class DynamicModuleUtils {
         const clientOptions: ClientOptions = {
           transport: Transport.REDIS,
           options: {
-            host: appConfigService.redisUrl,
-            port: 6379,
+            host: appConfigService.redisHost,
+            port: appConfigService.redisPort,
+            password: appConfigService.redisPassword || undefined,
             retryDelay: 1000,
             retryAttempts: 10,
             retryStrategy: () => 1000,