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

queue: Fix types to reflect that Pika channels receive bytes.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-08-07 00:35:25 -07:00
committed by Tim Abbott
parent a40c67712c
commit 23b815bb50
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/queue.py
View File

@@ -16,7 +16,7 @@ from tornado import ioloop
from zerver.lib.utils import statsd from zerver.lib.utils import statsd
MAX_REQUEST_RETRIES = 3 MAX_REQUEST_RETRIES = 3
Consumer = Callable[[BlockingChannel, Basic.Deliver, pika.BasicProperties, str], None] Consumer = Callable[[BlockingChannel, Basic.Deliver, pika.BasicProperties, bytes], None]
# This simple queuing library doesn't expose much of the power of # This simple queuing library doesn't expose much of the power of
# rabbitmq/pika's queuing system; its purpose is to just provide an # rabbitmq/pika's queuing system; its purpose is to just provide an
@@ -140,7 +140,7 @@ class SimpleQueueClient:
def wrapped_consumer(ch: BlockingChannel, def wrapped_consumer(ch: BlockingChannel,
method: Basic.Deliver, method: Basic.Deliver,
properties: pika.BasicProperties, properties: pika.BasicProperties,
body: str) -> None: body: bytes) -> None:
try: try:
consumer(ch, method, properties, body) consumer(ch, method, properties, body)
ch.basic_ack(delivery_tag=method.delivery_tag) ch.basic_ack(delivery_tag=method.delivery_tag)
@@ -163,7 +163,7 @@ class SimpleQueueClient:
def wrapped_callback(ch: BlockingChannel, def wrapped_callback(ch: BlockingChannel,
method: Basic.Deliver, method: Basic.Deliver,
properties: pika.BasicProperties, properties: pika.BasicProperties,
body: str) -> None: body: bytes) -> None:
callback(ujson.loads(body)) callback(ujson.loads(body))
self.register_consumer(queue_name, wrapped_callback) self.register_consumer(queue_name, wrapped_callback)
@@ -316,7 +316,7 @@ class TornadoQueueClient(SimpleQueueClient):
def wrapped_consumer(ch: BlockingChannel, def wrapped_consumer(ch: BlockingChannel,
method: Basic.Deliver, method: Basic.Deliver,
properties: pika.BasicProperties, properties: pika.BasicProperties,
body: str) -> None: body: bytes) -> None:
consumer(ch, method, properties, body) consumer(ch, method, properties, body)
ch.basic_ack(delivery_tag=method.delivery_tag) ch.basic_ack(delivery_tag=method.delivery_tag)