From 39dabdb0c8a7282f11fc8644bd3eecea25d64ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 24 Nov 2016 11:53:40 +0100 Subject: [PATCH] Fix deprectae warnings with amqp >= 2.x --- taiga/events/backends/rabbitmq.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/taiga/events/backends/rabbitmq.py b/taiga/events/backends/rabbitmq.py index 829dcf3a..c09113c6 100644 --- a/taiga/events/backends/rabbitmq.py +++ b/taiga/events/backends/rabbitmq.py @@ -50,17 +50,21 @@ class EventsPushBackend(base.BaseEventsPushBackend): def emit_event(self, message:str, *, routing_key:str, channel:str="events"): connection = _make_rabbitmq_connection(self.url) - try: - rchannel = connection.channel() - message = AmqpMessage(message) + connection.connect() + except ConnectionRefusedError: + log.error("EventsPushBackend: Unable to connect with RabbitMQ at {}".format(self.url), + exc_info=True) + else: + try: + message = AmqpMessage(message) + rchannel = connection.channel() - rchannel.exchange_declare(exchange=channel, type="topic", auto_delete=True) - rchannel.basic_publish(message, routing_key=routing_key, exchange=channel) - rchannel.close() - - except Exception: - log.error("Unhandled exception", exc_info=True) - - finally: - connection.close() + rchannel.exchange_declare(exchange=channel, type="topic", auto_delete=True) + rchannel.basic_publish(message, routing_key=routing_key, exchange=channel) + rchannel.close() + except Exception: + log.error("EventsPushBackend: Unhandled exception", + exc_info=True) + finally: + connection.close()