diff --git a/pyinfra/pyampq/consumer.py b/pyinfra/pyampq/consumer.py index d01f270..3bf9683 100644 --- a/pyinfra/pyampq/consumer.py +++ b/pyinfra/pyampq/consumer.py @@ -7,7 +7,7 @@ class Consumer: self.callback = callback def consume_and_publish(self): - yield from self.queue_manager.consume_and_publish(self.callback) + self.queue_manager.consume_and_publish(self.callback) def consume(self): yield from self.queue_manager.consume() diff --git a/pyinfra/pyampq/queue_manager/pika_queue_manager.py b/pyinfra/pyampq/queue_manager/pika_queue_manager.py index a0f34ed..0933b1e 100644 --- a/pyinfra/pyampq/queue_manager/pika_queue_manager.py +++ b/pyinfra/pyampq/queue_manager/pika_queue_manager.py @@ -74,8 +74,8 @@ class PikaQueueManager(QueueManager): args = {"x-dead-letter-exchange": "", "x-dead-letter-routing-key": dead_letter_queue} - self.channel.queue_declare(input_queue, arguments=args, auto_delete=False, durable=False) - self.channel.queue_declare(output_queue, arguments=args, auto_delete=False, durable=False) + self.channel.queue_declare(input_queue, arguments=args, auto_delete=False) + self.channel.queue_declare(output_queue, arguments=args, auto_delete=False) def republish(self, body, n_current_attempts, frame): self.channel.basic_publish( @@ -122,12 +122,12 @@ class PikaQueueManager(QueueManager): logger.debug("Consuming") return self.channel.consume(self._input_queue) - def consume_and_publish(self, callback): + def consume_and_publish(self, visitor): - logger.info(f"Consuming with callback {callback.__name__}") + logger.info(f"Consuming with callback {visitor.callback.__name__}") for message in self.consume(): - self.publish_response(message, callback) + self.publish_response(message, visitor) def clear(self): self.channel.queue_purge(self._input_queue) diff --git a/pyinfra/rabbitmq.py b/pyinfra/rabbitmq.py index 11069fb..1d1b22a 100644 --- a/pyinfra/rabbitmq.py +++ b/pyinfra/rabbitmq.py @@ -11,7 +11,7 @@ def make_channel(connection) -> pika.adapters.blocking_connection.BlockingChanne def declare_queue(channel, queue: str): args = {"x-dead-letter-exchange": "", "x-dead-letter-routing-key": CONFIG.rabbitmq.queues.dead_letter} - return channel.queue_declare(queue=queue, auto_delete=False, arguments=args, durable=True) + return channel.queue_declare(queue=queue, auto_delete=False, arguments=args) def read_connection_params():