From bec5c8257b38fb3de7a4efb910f32286cc1ee64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20DA=20ROCHA?= <sdarocha@neogeo.fr>
Date: Thu, 23 Jun 2022 20:48:22 +0000
Subject: [PATCH] Revert "Merge branch 'development' into 'master'"
This reverts merge request !20
---
src/health/redis.healthIndicator.ts | 9 +++++++--
src/helpers/redis.helper.ts | 11 ++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/health/redis.healthIndicator.ts b/src/health/redis.healthIndicator.ts
index 6c6f2b0..bdf6308 100644
--- a/src/health/redis.healthIndicator.ts
+++ b/src/health/redis.healthIndicator.ts
@@ -7,7 +7,12 @@ export class RedisHealthIndicator extends HealthIndicator {
async checkRedisConnection(redisConf: { sentinelHost: string, sentinelPort: number, groupName: string; }): Promise<HealthIndicatorResult> {
- const client = new IORedis({ host: redisConf.sentinelHost, port: redisConf.sentinelPort});
+ const client = new IORedis({
+ sentinels: [
+ { host: redisConf.sentinelHost, port: redisConf.sentinelPort },
+ ],
+ name: redisConf.groupName,
+ });
await new Promise((resolve, reject) => {
client.on('ready', resolve);
@@ -28,4 +33,4 @@ export class RedisHealthIndicator extends HealthIndicator {
return this.getStatus('Redis', true);
}
-}
+}
\ No newline at end of file
diff --git a/src/helpers/redis.helper.ts b/src/helpers/redis.helper.ts
index 67518e8..e73e6ef 100644
--- a/src/helpers/redis.helper.ts
+++ b/src/helpers/redis.helper.ts
@@ -13,7 +13,16 @@ export class Redis {
Logger.log(`Entering function`, `Redis.connect`);
let cfg:any={
host: this.redisConfig.sentinelHost, port: this.redisConfig.sentinelPort ,
+ name: this.redisConfig.groupName,
};
+ if(this.redisConfig.sentinel){
+ cfg={
+ sentinels: [
+ { host: this.redisConfig.sentinelHost, port: this.redisConfig.sentinelPort },
+ ],
+ name: this.redisConfig.groupName,
+ };
+ }
const client = new IORedis(cfg);
@@ -94,4 +103,4 @@ export class Redis {
handleError(error, new InternalServerErrorException('Couldn\'t remove key/value in redis.'));
}
}
-}
+}
\ No newline at end of file
--
GitLab