FKITDEV-2146: Fix the reconnecting

src/QueueConnection.js

@@ -54,7 +54,7 @@ class QueueConnection extends EventEmitter {
       return connection
     }).catch((err) => {
       this._logger.error('RabbitMQ connection failed', err)
-
+      this._connectionPromise = null
       throw err
     })
 
@@ -146,7 +146,9 @@ class QueueConnection extends EventEmitter {
         await this._connection.close()
       } catch (err) {
         this._logger.error('RabbitMQ close connection failed', err)
-        throw err
+        if (!err.message.startsWith('Connection closed')) {
+          throw err
+        }
       }
     }
 

test/ConnectionPool.test.js

@@ -107,6 +107,25 @@ describe('ConnectionPool', () => {
     })
   })
 
+  it('should reconnect if the connection is already closed', async () => {
+    const pool = new ConnectionPool()
+    pool.setLogger(logger)
+    pool.setupQueueManagers({
+      default: config
+    })
+    try {
+      await pool.connect()
+      const queueManager = pool.getConnection('default')
+      await queueManager.connection.close()
+      await pool.reconnect()
+
+      assert.isNotNull(queueManager.connection._connection)
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error)
+    }
+  })
+
   it('Should not reconnect to wrong config', (done) => {
     const pool = new ConnectionPool()
     pool.setLogger(logger)

test/QueueConnection.test.js

@@ -238,4 +238,29 @@ describe('QueueConnection', () => {
 
     assert.strictEqual(callbackCalled, false)
   })
+
+  it('#close() already closed connection should not throw error', async () => {
+    const connection = new QueueConnection(config)
+    try {
+      await connection.connect()
+    } catch (connectionConnectError) {
+      throw new Error(`connect() failed: ${connectionConnectError}`)
+    }
+
+    try {
+      await connection.close()
+    } catch (connectionCloseError) {
+      throw new Error(`close() failed: ${connectionCloseError}`)
+    }
+
+    try {
+      await connection.close()
+    } catch (connectionCloseError) {
+      throw new Error(`close() on already closed connection failed: ${connectionCloseError}`)
+    }
+
+    assert.strictEqual(connection._connection, null)
+    assert.strictEqual(connection._connectionPromise, null)
+    assert.doesNotThrow(connection.close, Error)
+  })
 })