Skip to content

Make reconnecting to a lost RabbitMQ work. #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamieCressey merged 2 commits into from
Dec 3, 2015
+18 −10
Merged

Make reconnecting to a lost RabbitMQ work. #347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a74249
Make reconnecting to a lost RabbitMQ work.
timstoop Sep 11, 2015
2033a5f
Support both older and newer pika.
timstoop Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions beaver/transports/rabbitmq_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,15 @@ def _publish_message(self):
self._count = 0
else:
self._count += 1
self._channel.basic_publish(
exchange=self._rabbitmq_config['exchange'],
routing_key=self._rabbitmq_config['key'],
body=line,
properties=pika.BasicProperties(
content_type='text/json',
delivery_mode=self._rabbitmq_config['delivery_mode']
))
if self._channel != None:
self._channel.basic_publish(
exchange=self._rabbitmq_config['exchange'],
routing_key=self._rabbitmq_config['key'],
body=line,
properties=pika.BasicProperties(
content_type='text/json',
delivery_mode=self._rabbitmq_config['delivery_mode']
))
else:
self._logger.debug("RabbitMQ transport queue is empty, sleeping for 1 second.")
time.sleep(1)
Expand All @@ -93,15 +94,22 @@ def _on_connection_open_error(self,non_used_connection=None,error=None):

def _on_connection_closed(self, connection, reply_code, reply_text):
self._channel = None
if self._connection._closing:
if hasattr(self._connection, '_closing'):
closing = self._connection._closing
elif hasattr(self._connection, 'is_closing'):
closing = self._connection.is_closing
else:
raise NotImplementedError('Unsure how to check whether the connection is closing.')
if closing:
try:
self._connection.ioloop.stop()
except:
pass
else:
self._logger.warning('RabbitMQ Connection closed, reopening in 1 seconds: (%s) %s',
reply_code, reply_text)
self._connection.add_timeout(1, self.reconnect)
time.sleep(1)
self.reconnect()

def reconnect(self):
try:
Expand Down