@autofleet/rabbit 3.4.0-beta.6 → 3.4.0-beta.8

package/dist/index.js

@@ -617,22 +617,24 @@ class RabbitMq {
                 ]);
             });
         }
-        // TODO: [QUORUM-PHASE-3] Delete the old implementation
-        await this.saveConsumerOld(queue, callback, options);
-        const channelOld = await this.getNewChannelOld({
-            name: `consume-exchange-${exchange}-queue-${queue}-old`,
-            connection: this.oldConsumeConnection,
-        });
-        await channelOld.addSetup(async (c) => {
-            const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
-            await c.assertQueue(queue);
-            this.oldExchanges[exchange] = assertExchange;
-            await c.prefetch(limit, false);
-            return Promise.all([
-                c.bindQueue(queue, exchange, ''),
-                this.consumeOld(queue, callback, options),
-            ]);
-        });
+        else {
+            // TODO: [QUORUM-PHASE-3] Delete the old implementation
+            await this.saveConsumerOld(queue, callback, options);
+            const channelOld = await this.getNewChannelOld({
+                name: `consume-exchange-${exchange}-queue-${queue}-old`,
+                connection: this.oldConsumeConnection,
+            });
+            await channelOld.addSetup(async (c) => {
+                const assertExchange = await (0, utils_1.assertExchangeFanout)(c, exchange);
+                await c.assertQueue(queue);
+                this.oldExchanges[exchange] = assertExchange;
+                await c.prefetch(limit, false);
+                return Promise.all([
+                    c.bindQueue(queue, exchange, ''),
+                    this.consumeOld(queue, callback, options),
+                ]);
+            });
+        }
     }
     // Used by the microservices to publish messages to the exchange
     // TODO: [QUORUM-PHASE-2] Change the implementation to the new one
@@ -675,6 +677,26 @@ class RabbitMq {
     }
     // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
     async isConnected() {
+        debug('rabbit: start old is connected');
+        const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
+        const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
+        const oldIsConnected = oldConsumeConnection.isConnected() && oldPublishConnection.isConnected();
+        if (!oldIsConnected) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        const oldChannel = await this.assertChannelOld({ connection: this.oldPublishConnection });
+        try {
+            await Promise.all([
+                oldChannel.waitForConnect(),
+                ...this.oldConsumers.map((c) => oldChannel.checkQueue(c.queue)),
+            ]);
+        }
+        catch (e) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        logger_1.default.debug('rabbit: old isConnected - true');
         debug('rabbit: start is connected');
         const consumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
         const publishConnection = await this.getConnectionOld(this.oldPublishConnection);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.4.0-beta.6",
+  "version": "3.4.0-beta.8",
   "description": "",
   "main": "dist/index.js",
   "engines": {

package/src/index.ts

@@ -853,28 +853,28 @@ class RabbitMq implements IAfRabbitMq {
           ),
         ]);
       });
+    } else {
+      // TODO: [QUORUM-PHASE-3] Delete the old implementation
+      await this.saveConsumerOld(queue, callback, options);
+      const channelOld: ChannelWrapper = await this.getNewChannelOld({
+        name: `consume-exchange-${exchange}-queue-${queue}-old`,
+        connection: this.oldConsumeConnection,
+      });
+      await channelOld.addSetup(async (c: ConfirmChannel) => {
+        const assertExchange = await assertExchangeFanout(c, exchange);
+        await c.assertQueue(queue);
+        this.oldExchanges[exchange] = assertExchange;
+        await c.prefetch(limit, false);
+        return Promise.all([
+          c.bindQueue(queue, exchange, ''),
+          this.consumeOld(
+            queue,
+            callback,
+            options,
+          ),
+        ]);
+      });
     }
-
-    // TODO: [QUORUM-PHASE-3] Delete the old implementation
-    await this.saveConsumerOld(queue, callback, options);
-    const channelOld: ChannelWrapper = await this.getNewChannelOld({
-      name: `consume-exchange-${exchange}-queue-${queue}-old`,
-      connection: this.oldConsumeConnection,
-    });
-    await channelOld.addSetup(async (c: ConfirmChannel) => {
-      const assertExchange = await assertExchangeFanout(c, exchange);
-      await c.assertQueue(queue);
-      this.oldExchanges[exchange] = assertExchange;
-      await c.prefetch(limit, false);
-      return Promise.all([
-        c.bindQueue(queue, exchange, ''),
-        this.consumeOld(
-          queue,
-          callback,
-          options,
-        ),
-      ]);
-    });
   }
 
   // Used by the microservices to publish messages to the exchange
@@ -928,6 +928,26 @@ class RabbitMq implements IAfRabbitMq {
 
   // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
   async isConnected() : Promise<boolean> {
+    debug('rabbit: start old is connected');
+    const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
+    const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
+    const oldIsConnected = oldConsumeConnection.isConnected() && oldPublishConnection.isConnected();
+    if (!oldIsConnected) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    const oldChannel: any = await this.assertChannelOld({ connection: this.oldPublishConnection });
+    try {
+      await Promise.all([
+        oldChannel.waitForConnect(),
+        ...this.oldConsumers.map((c: AfConsumer) => oldChannel.checkQueue(c.queue)),
+      ]);
+    } catch (e) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    logger.debug('rabbit: old isConnected - true');
+
     debug('rabbit: start is connected');
     const consumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
     const publishConnection = await this.getConnectionOld(this.oldPublishConnection);