Merge pull request #15062 from yatin166/fix/close-redis-and-amqp-client-connection-properly

fix(microservices): ensure all redis and amqp client closes properly

Author: kamilmysliwiec

packages/microservices/client/client-redis.ts

@@ -53,9 +53,9 @@ export class ClientRedis extends ClientProxy<RedisEvents, RedisStatus> {
     return `${pattern}.reply`;
   }
 
-  public close() {
-    this.pubClient && this.pubClient.quit();
-    this.subClient && this.subClient.quit();
+  public async close() {
+    this.pubClient && (await this.pubClient.quit());
+    this.subClient && (await this.subClient.quit());
     this.pubClient = this.subClient = null;
     this.isManuallyClosed = true;
     this.pendingEventListeners = [];

packages/microservices/client/client-rmq.ts

@@ -96,9 +96,9 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
     this.initializeDeserializer(options);
   }
 
-  public close(): void {
-    this.channel && this.channel.close();
-    this.client && this.client.close();
+  public async close(): Promise<void> {
+    this.channel && (await this.channel.close());
+    this.client && (await this.client.close());
     this.channel = null;
     this.client = null;
     this.pendingEventListeners = [];

packages/microservices/test/client/client-redis.spec.ts

@@ -195,22 +195,22 @@ describe('ClientRedis', () => {
       untypedClient.pubClient = pub;
       untypedClient.subClient = sub;
     });
-    it('should close "pub" when it is not null', () => {
-      client.close();
+    it('should close "pub" when it is not null', async () => {
+      await client.close();
       expect(pubClose.called).to.be.true;
     });
-    it('should not close "pub" when it is null', () => {
+    it('should not close "pub" when it is null', async () => {
       untypedClient.pubClient = null;
-      client.close();
+      await client.close();
       expect(pubClose.called).to.be.false;
     });
-    it('should close "sub" when it is not null', () => {
-      client.close();
+    it('should close "sub" when it is not null', async () => {
+      await client.close();
       expect(subClose.called).to.be.true;
     });
-    it('should not close "sub" when it is null', () => {
+    it('should not close "sub" when it is null', async () => {
       untypedClient.subClient = null;
-      client.close();
+      await client.close();
       expect(subClose.called).to.be.false;
     });
   });

packages/microservices/test/client/client-rmq.spec.ts

@@ -368,13 +368,13 @@ describe('ClientRMQ', function () {
       untypedClient.client = { close: clientCloseSpy };
     });
 
-    it('should close channel when it is not null', () => {
-      client.close();
+    it('should close channel when it is not null', async () => {
+      await client.close();
       expect(channelCloseSpy.called).to.be.true;
     });
 
-    it('should close client when it is not null', () => {
-      client.close();
+    it('should close client when it is not null', async () => {
+      await client.close();
       expect(clientCloseSpy.called).to.be.true;
     });
   });