paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rabbitmq: Reorder a bit to group our reconnect logic together.

Browse Source
This commit is contained in:
Greg Price
2017-11-29 15:58:52 -08:00
committed by Tim Abbott
parent c32b16715d
commit 7ac2b58584
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/lib/queue.py
View File

@@ -197,17 +197,6 @@ class TornadoQueueClient(SimpleQueueClient):
self.queues = set()
self._connect()
def _on_open(self, connection: pika.connection.Connection) -> None:
self.connection.channel(
on_open_callback = self._on_channel_open)
def _on_channel_open(self, channel: BlockingChannel) -> None:
self.channel = channel
for callback in self._on_open_cbs:
callback()
self._reconnect_consumer_callbacks()
self.log.info('TornadoQueueClient connected')
def _on_connection_closed(self, connection: pika.connection.Connection,
reply_code: int, reply_text: str) -> None:
self.log.warning("TornadoQueueClient lost connection to RabbitMQ, reconnecting...")
@@ -225,6 +214,17 @@ class TornadoQueueClient(SimpleQueueClient):
ioloop.IOLoop.instance().call_later(retry_seconds, on_timeout)
def _on_open(self, connection: pika.connection.Connection) -> None:
self.connection.channel(
on_open_callback = self._on_channel_open)
def _on_channel_open(self, channel: BlockingChannel) -> None:
self.channel = channel
for callback in self._on_open_cbs:
callback()
self._reconnect_consumer_callbacks()
self.log.info('TornadoQueueClient connected')
def ensure_queue(self, queue_name: str, callback: Callable[[], None]) -> None:
def finish(frame: Any) -> None:
self.queues.add(queue_name)