From d36368bf58e090bd960104ac6bf9c384086e9c23 Mon Sep 17 00:00:00 2001 From: Icebob Date: Sat, 13 Jan 2024 12:30:15 +0100 Subject: [PATCH 1/2] change from 'connect' to 'ready' event in redis clients. Fixes #1257 --- src/cachers/redis.js | 2 +- src/transporters/redis.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cachers/redis.js b/src/cachers/redis.js index 768339609..6c2531f1f 100644 --- a/src/cachers/redis.js +++ b/src/cachers/redis.js @@ -82,7 +82,7 @@ class RedisCacher extends BaseCacher { this.connected = false; - this.client.on("connect", () => { + this.client.on("ready", () => { this.connected = true; /* istanbul ignore next */ diff --git a/src/transporters/redis.js b/src/transporters/redis.js index 038276648..87c9071db 100644 --- a/src/transporters/redis.js +++ b/src/transporters/redis.js @@ -42,13 +42,13 @@ class RedisTransporter extends Transporter { let clientSub = this.getRedisClient(this.opts); this._clientSub = clientSub; // For tests - clientSub.on("connect", () => { + clientSub.on("ready", () => { this.logger.info("Redis-sub client is connected."); let clientPub = this.getRedisClient(this.opts); this._clientPub = clientPub; // For tests - clientPub.on("connect", () => { + clientPub.on("ready", () => { this.clientSub = clientSub; this.clientPub = clientPub; From 8b1f39ea1f2997a3d667edb93f19969a06fdce40 Mon Sep 17 00:00:00 2001 From: Icebob Date: Sat, 13 Jan 2024 12:38:00 +0100 Subject: [PATCH 2/2] update unit test --- test/unit/transporters/redis.spec.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/unit/transporters/redis.spec.js b/test/unit/transporters/redis.spec.js index 9ed91ded9..16f8519d4 100644 --- a/test/unit/transporters/redis.spec.js +++ b/test/unit/transporters/redis.spec.js @@ -141,7 +141,7 @@ function itShouldTestRedisTransportConnectDisconnect(clusterMode = false) { let p = transporter.connect().then(() => { expect(transporter.clientSub).toBeDefined(); expect(transporter.clientSub.on).toHaveBeenCalledTimes(4); - expect(transporter.clientSub.on).toHaveBeenCalledWith("connect", expect.any(Function)); + expect(transporter.clientSub.on).toHaveBeenCalledWith("ready", expect.any(Function)); expect(transporter.clientSub.on).toHaveBeenCalledWith("error", expect.any(Function)); expect(transporter.clientSub.on).toHaveBeenCalledWith("close", expect.any(Function)); expect(transporter.clientSub.on).toHaveBeenCalledWith( @@ -151,13 +151,13 @@ function itShouldTestRedisTransportConnectDisconnect(clusterMode = false) { expect(transporter.clientPub).toBeDefined(); expect(transporter.clientPub.on).toHaveBeenCalledTimes(3); - expect(transporter.clientPub.on).toHaveBeenCalledWith("connect", expect.any(Function)); + expect(transporter.clientPub.on).toHaveBeenCalledWith("ready", expect.any(Function)); expect(transporter.clientPub.on).toHaveBeenCalledWith("error", expect.any(Function)); expect(transporter.clientPub.on).toHaveBeenCalledWith("close", expect.any(Function)); }); - transporter._clientSub.onCallbacks.connect(); - transporter._clientPub.onCallbacks.connect(); + transporter._clientSub.onCallbacks.ready(); + transporter._clientPub.onCallbacks.ready(); return p; }); @@ -182,8 +182,8 @@ function itShouldTestRedisTransportConnectDisconnect(clusterMode = false) { }); }); - transporter._clientSub.onCallbacks.connect(); - transporter._clientPub.onCallbacks.connect(); + transporter._clientSub.onCallbacks.ready(); + transporter._clientPub.onCallbacks.ready(); // Trigger an error transporter._clientPub.onCallbacks.error(new Error("Ups")); transporter._clientSub.onCallbacks.error(new Error("Ups")); @@ -198,8 +198,8 @@ function itShouldTestRedisTransportConnectDisconnect(clusterMode = false) { expect(transporter.onConnected).toHaveBeenCalledWith(); }); - transporter._clientSub.onCallbacks.connect(); - transporter._clientPub.onCallbacks.connect(); + transporter._clientSub.onCallbacks.ready(); + transporter._clientPub.onCallbacks.ready(); return p; }); @@ -215,8 +215,8 @@ function itShouldTestRedisTransportConnectDisconnect(clusterMode = false) { expect(cbPub).toHaveBeenCalledTimes(1); }); - transporter._clientSub.onCallbacks.connect(); // Trigger the `resolve` - transporter._clientPub.onCallbacks.connect(); // Trigger the `resolve` + transporter._clientSub.onCallbacks.ready(); // Trigger the `resolve` + transporter._clientPub.onCallbacks.ready(); // Trigger the `resolve` return p; }); } @@ -247,8 +247,8 @@ function itShouldTestRedisTransportPublishSubscribe(clusterMode = false) { transporter.incomingMessage = jest.fn(); let p = transporter.connect(); - transporter._clientSub.onCallbacks.connect(); // Trigger the `resolve` - transporter._clientPub.onCallbacks.connect(); // Trigger the `resolve` + transporter._clientSub.onCallbacks.ready(); // Trigger the `resolve` + transporter._clientPub.onCallbacks.ready(); // Trigger the `resolve` return p; });