paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add register() call to event system

Browse Source 
(imported from commit 0c9fbfec1866591b2169ce2da2bc2af6003f8f31)
This commit is contained in:
Zev Benjamin
2013-03-14 18:21:53 -04:00
parent b12715e3f2
commit 6cc70d94f6
6 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zephyr/tornadoviews.py
View File

@@ -210,7 +210,8 @@ def rest_get_events(request, user_profile, handler,
@has_request_variables
def get_events_backend(request, user_profile, handler,
last_event_id = REQ(converter=to_non_negative_int, default=None),
queue_id = REQ(default=None), apply_markdown=True):
queue_id = REQ(default=None), apply_markdown=True,
dont_block = REQ(default=False, converter=json_to_bool)):
if queue_id is None:
client = allocate_client_descriptor(user_profile.id, apply_markdown)
queue_id = client.event_queue.id
@@ -225,7 +226,7 @@ def get_events_backend(request, user_profile, handler,
client.event_queue.prune(last_event_id)
client.disconnect_handler()
if not client.event_queue.empty():
if not client.event_queue.empty() or dont_block:
return json_success({'events': client.event_queue.contents(),
'queue_id': queue_id})