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

Apply events in register() 

(imported from commit 4e30e52d968ceec596ecbabe71d4d9378cc8f7d9)
This commit is contained in:
Zev Benjamin 2013-03-22 13:21:50 -04:00
parent 7248659c4c
commit f2b1de7940
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zephyr/lib/event_queue.py
View File

@ -172,7 +172,8 @@ def setup_event_queue(io_loop):
send_restart_events() send_restart_events()
# Called from Django # The following functions are called from Django
def request_event_queue(user_profile, apply_markdown): def request_event_queue(user_profile, apply_markdown):
if settings.TORNADO_SERVER: if settings.TORNADO_SERVER:
req = {'dont_block' : 'true', req = {'dont_block' : 'true',
@ -188,3 +189,16 @@ def request_event_queue(user_profile, apply_markdown):
return resp.json['queue_id'] return resp.json['queue_id']
return None return None
def get_user_events(user_profile, queue_id, last_event_id):
if settings.TORNADO_SERVER:
resp = requests.get(settings.TORNADO_SERVER + '/api/v1/events',
auth=requests.auth.HTTPBasicAuth(user_profile.user.email,
user_profile.api_key),
params={'queue_id' : queue_id,
'last_event_id': last_event_id,
'client' : 'internal'})
resp.raise_for_status()
return resp.json['events']

18
zephyr/views.py
View File

@ -43,7 +43,7 @@ from zephyr.lib.response import json_success, json_error, json_response, json_me
from zephyr.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp from zephyr.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp
from zephyr.lib.cache import cache_with_key from zephyr.lib.cache import cache_with_key
from zephyr.lib.unminify import SourceMap from zephyr.lib.unminify import SourceMap
from zephyr.lib.event_queue import request_event_queue from zephyr.lib.event_queue import request_event_queue, get_user_events
from zephyr import tornado_callbacks from zephyr import tornado_callbacks
from confirmation.models import Confirmation from confirmation.models import Confirmation
@ -1423,7 +1423,11 @@ def events_register_backend(request, user_profile, apply_markdown=True,
ret = {'queue_id': queue_id} ret = {'queue_id': queue_id}
event_types = set(event_types) event_types = set(event_types)
# Fetch initial data
if "message" in event_types: if "message" in event_types:
# The client should use get_old_messages() to fetch messages
# starting with the max_message_id. They will get messages
# newer than that ID via get_events()
messages = Message.objects.filter(usermessage__user_profile=user_profile).order_by('-id')[:1] messages = Message.objects.filter(usermessage__user_profile=user_profile).order_by('-id')[:1]
if messages: if messages:
ret['max_message_id'] = messages[0].id ret['max_message_id'] = messages[0].id
@ -1432,5 +1436,17 @@ def events_register_backend(request, user_profile, apply_markdown=True,
if "pointer" in event_types: if "pointer" in event_types:
ret['pointer'] = user_profile.pointer ret['pointer'] = user_profile.pointer
# Apply events that came in while we were fetching initial data
events = get_user_events(user_profile, queue_id, -1)
for event in events:
if event['type'] == "message":
ret['max_message_id'] = max(ret['max_message_id'], event['message']['id'])
elif event['type'] == "pointer":
ret['pointer'] = max(ret['pointer'], event['pointer'])
if events:
ret['last_event_id'] = events[-1:]['id']
else:
ret['last_event_id'] = -1 ret['last_event_id'] = -1
return json_success(ret) return json_success(ret)