send_event: Remove useless return value and annotate.

Detected by mypy.

[tweaked by tabbott to pass mypy check and remove annotations]
This commit is contained in:
Conrad Dean
2016-06-05 15:32:00 -04:00
committed by Tim Abbott
parent a4704ba8b2
commit d77c70220c
2 changed files with 12 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
from __future__ import absolute_import
from typing import Any
from typing import Any, Dict, Iterable, Union
from django.utils.translation import ugettext as _
from django.conf import settings
@@ -760,9 +760,14 @@ def send_notification_http(data):
process_notification(data)
def send_notification(data):
return queue_json_publish("notify_tornado", data, send_notification_http)
# type: (Dict[str, Any]) -> None
queue_json_publish("notify_tornado", data, send_notification_http)
def send_event(event, users):
return queue_json_publish("notify_tornado",
dict(event=event, users=users),
send_notification_http)
# type: (Dict[str, Any], Union[Iterable[int], Iterable[Dict[str, Any]]]) -> None
"""`users` is a list of user IDs, or in the case of `message` type
events, a list of dicts describing the users and metadata about
the user/message pair."""
queue_json_publish("notify_tornado",
dict(event=event, users=users),
send_notification_http)

View File

@@ -94,12 +94,12 @@ class SimpleQueueClient(object):
def json_publish(self, queue_name, body):
try:
return self.publish(queue_name, ujson.dumps(body))
self.publish(queue_name, ujson.dumps(body))
except (AttributeError, pika.exceptions.AMQPConnectionError):
self.log.warning("Failed to send to rabbitmq, trying to reconnect and send again")
self._reconnect()
return self.publish(queue_name, ujson.dumps(body))
self.publish(queue_name, ujson.dumps(body))
def register_consumer(self, queue_name, consumer):
def wrapped_consumer(ch, method, properties, body):