From 1f8114379bdeb3af8640c71c2edde2a672bb358c Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Mon, 22 Aug 2022 16:55:04 +0200 Subject: [PATCH] RED-5009: Added the possibility for a callback to signal that a message should be declined/dead-lettered --- pyinfra/queue/queue_manager.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pyinfra/queue/queue_manager.py b/pyinfra/queue/queue_manager.py index b3bb425..e5cf5d2 100644 --- a/pyinfra/queue/queue_manager.py +++ b/pyinfra/queue/queue_manager.py @@ -125,17 +125,20 @@ class QueueManager(object): try: unpacked_message_body = json.loads(body) - callback_result = process_message_callback(unpacked_message_body) + should_publish_result, callback_result = process_message_callback(unpacked_message_body) - self.logger.info("Processed message, publishing result to result-queue") - self._channel.basic_publish("", self._output_queue, json.dumps(callback_result).encode()) + if should_publish_result: + self.logger.info(f"Processed message with delivery_tag {frame.delivery_tag}, " + f"publishing result to result-queue") + self._channel.basic_publish("", self._output_queue, json.dumps(callback_result).encode()) - self.logger.info( - f"Result published, acknowledging incoming message with delivery_tag {frame.delivery_tag}" - ) - self._channel.basic_ack(frame.delivery_tag) + self.logger.info( + f"Result published, acknowledging incoming message with delivery_tag {frame.delivery_tag}" + ) + self._channel.basic_ack(frame.delivery_tag) + else: + self.logger.info(f"Processed message with delivery_tag {frame.delivery_tag}, declining message") - self.logger.info(f"Message with delivery_tag {frame.delivery_tag} processed") except Exception as ex: n_attempts = _get_n_previous_attempts(properties) + 1 self.logger.warning(f"Failed to process message, {n_attempts} attempts, error: {str(ex)}")