Cleanup

kibertoad · Sep 27, 2023 · be376ab · be376ab
1 parent decb5e2
commit be376ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/amqp/lib/AbstractAmqpPublisherMonoSchema.ts b/packages/amqp/lib/AbstractAmqpPublisherMonoSchema.ts
@@ -47,7 +47,10 @@ export abstract class AbstractAmqpPublisherMonoSchema<MessagePayloadType extends
       // but if server closes connection unexpectedly (e. g. RabbitMQ is shut down), then we don't land here
       // @ts-ignore
       if (err.message === 'Channel closed') {
+        this.logger.error(`AMQP channel closed`)
         void this.reconnect()
+      } else {
+        throw err
       }
     }
   }

diff --git a/packages/amqp/lib/AbstractAmqpPublisherMultiSchema.ts b/packages/amqp/lib/AbstractAmqpPublisherMultiSchema.ts
@@ -55,7 +55,10 @@ export abstract class AbstractAmqpPublisherMultiSchema<MessagePayloadType extend
       // but if server closes connection unexpectedly (e. g. RabbitMQ is shut down), then we don't land here
       // @ts-ignore
       if (err.message === 'Channel closed') {
+        this.logger.error(`AMQP channel closed`)
         void this.reconnect()
+      } else {
+        throw err
       }
     }
   }

diff --git a/packages/amqp/test/consumers/AmqpPermissionsConsumer.spec.ts b/packages/amqp/test/consumers/AmqpPermissionsConsumer.spec.ts
@@ -119,14 +119,18 @@ describe('PermissionsConsumer', () => {
       })
 
       const updatedUsersPermissions = await waitAndRetry(() => {
+        const checkResult = checkPermissions(userIds)
+        if (checkResult) {
+          return checkResult
+        }
+
         publisher.publish({
           messageType: 'add',
           userIds,
           permissions: perms,
         })
-
-        return checkPermissions(userIds)
-      })
+        return false
+      }, 50)
 
       if (null === updatedUsersPermissions) {
         throw new Error('Users permissions unexpectedly null')