Update

Author: oklemenz2

src/redis-client/RedisClient.js

@@ -52,27 +52,26 @@ class RedisClient {
   async createClientAndConnect(options, errorHandlerCreateClient, isConnectionCheck) {
     try {
       const client = this.createClientBase(options);
-      if (!client) {
-        return;
-      }
-      if (!isConnectionCheck) {
-        client.on("error", (err) => {
-          const dateNow = Date.now();
-          if (dateNow - this.lastErrorLog > LOG_AFTER_SEC * 1000) {
-            this.log.error("Error from redis client", err);
-            this.lastErrorLog = dateNow;
-          }
-        });
+      if (client) {
+        if (!isConnectionCheck) {
+          client.on("error", (err) => {
+            const dateNow = Date.now();
+            if (dateNow - this.lastErrorLog > LOG_AFTER_SEC * 1000) {
+              this.log.error("Error from redis client", err);
+              this.lastErrorLog = dateNow;
+            }
+          });
 
-        client.on("reconnecting", () => {
-          const dateNow = Date.now();
-          if (dateNow - this.lastErrorLog > LOG_AFTER_SEC * 1000) {
-            this.log.info("Redis client trying reconnect...");
-            this.lastErrorLog = dateNow;
-          }
-        });
+          client.on("reconnecting", () => {
+            const dateNow = Date.now();
+            if (dateNow - this.lastErrorLog > LOG_AFTER_SEC * 1000) {
+              this.log.info("Redis client trying reconnect...");
+              this.lastErrorLog = dateNow;
+            }
+          });
+        }
+        await client.connect();
       }
-      await client.connect();
       return client;
     } catch (err) {
       errorHandlerCreateClient(err);
@@ -277,8 +276,7 @@ class RedisClient {
     try {
       if (client?.close) {
         await client.close();
-      }
-      if (client?.quit) {
+      } else if (client?.quit) {
         await client.quit();
       }
     } catch (err) {

…/migration-check/migration-check.test.js …t/migration-check/migration-check.xxx.jstest/migration-check/migration-check.test.js renamed to test/migration-check/migration-check.xxx.js test/migration-check/migration-check.test.js renamed to test/migration-check/migration-check.xxx.js

@@ -125,12 +125,8 @@ describe("Redis Client", () => {
   });
 
   describe("Sentinel Mode", () => {
-    beforeEach(async () => {
-      jest.clearAllMocks();
-      await RedisClient.closeAllClients();
-    });
 
-    it("creates Sentinel client when sentinel_nodes configured", async () => {
+    it.skip("creates Sentinel client when sentinel_nodes configured", async () => {
       cds.env.requires.redis = {
         credentials: {
           sentinel_nodes: [
@@ -167,7 +163,7 @@ describe("Redis Client", () => {
       await redisClient.closeMainClient();
     });
 
-    it.skip("prefers master_name field over URI fragment", async () => {
+    it("prefers master_name field over URI fragment", async () => {
       cds.env.requires.redis = {
         credentials: {
           sentinel_nodes: [{ host: "sentinel.local", port: 26379 }],