Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Send responses from fetch_events in dict format.

This commit is contained in:
Tim Abbott 2014-01-28 14:03:05 -05:00 committed by Tim Abbott
parent 485e46f136
commit bf43db0dad
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/event_queue.py
View File

@ -469,13 +469,14 @@ def fetch_events(query):
was_connected = client.finish_current_handler() was_connected = client.finish_current_handler()
if not client.event_queue.empty() or dont_block: if not client.event_queue.empty() or dont_block:
ret = {'events': client.event_queue.contents()} response = dict(events=client.event_queue.contents(),
handler_id=handler_id)
if orig_queue_id is None: if orig_queue_id is None:
ret['queue_id'] = queue_id response['queue_id'] = queue_id
extra_log_data = "[%s/%s]" % (queue_id, len(ret["events"])) extra_log_data = "[%s/%s]" % (queue_id, len(response["events"]))
if was_connected: if was_connected:
extra_log_data += " [was connected]" extra_log_data += " [was connected]"
return (ret, extra_log_data) return dict(type="response", response=response, extra_log_data=extra_log_data)
# After this point, dont_block=False, the queue is empty, and we # After this point, dont_block=False, the queue is empty, and we
# have a pre-existing queue, so we wait for new events. # have a pre-existing queue, so we wait for new events.
@ -483,10 +484,13 @@ def fetch_events(query):
logging.info("Disconnected handler for queue %s (%s/%s)" % (queue_id, user_profile_email, logging.info("Disconnected handler for queue %s (%s/%s)" % (queue_id, user_profile_email,
client_type_name)) client_type_name))
except JsonableError as e: except JsonableError as e:
if hasattr(e, 'to_json_error_msg') and callable(e.to_json_error_msg):
return dict(type="error", handler_id=handler_id,
message=e.to_json_error_msg())
raise e raise e
client.connect_handler(handler_id, client_type_name) client.connect_handler(handler_id, client_type_name)
return (RespondAsynchronously, None) return dict(type="async")
# The following functions are called from Django # The following functions are called from Django

1
zerver/lib/test_helpers.py
View File

@ -3,6 +3,7 @@ from django.test import TestCase
from zerver.lib.initial_password import initial_password from zerver.lib.initial_password import initial_password
from zerver.lib.db import TimeTrackingCursor from zerver.lib.db import TimeTrackingCursor
from zerver.lib.handlers import allocate_handler_id
from zerver.lib import cache from zerver.lib import cache
from zerver.lib import event_queue from zerver.lib import event_queue
from zerver.worker import queue_processors from zerver.worker import queue_processors

14
zerver/tornadoviews.py
View File

@ -82,9 +82,13 @@ def get_events_backend(request, user_profile, handler,
last_connection_time = time.time(), last_connection_time = time.time(),
narrow = narrow) narrow = narrow)
(result, log_data) = fetch_events(events_query) result = fetch_events(events_query)
request._log_data['extra'] = log_data if "extra_log_data" in result:
if result == RespondAsynchronously: request._log_data['extra'] = result["extra_log_data"]
if result["type"] == "async":
handler._request = request handler._request = request
return result return RespondAsynchronously
return json_success(result) if result["type"] == "error":
return json_error(result["message"])
return json_success(result["response"])