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

socket: Request the status of pending requests on reconnect

Browse Source 
This will hopefully help with the send dialog being stuck on
"sending" as well as allowing us to not show errors to the user on
reconnect.

(imported from commit 31ee889853f348e486863073dc130cdfb4e1338d)
This commit is contained in:
Zev Benjamin
2013-11-06 12:51:59 -05:00
parent 48a25211fa
commit 24ae5998e5
2 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zerver/lib/socket.py
View File

@@ -110,11 +110,24 @@ class SocketConnection(sockjs.tornado.SockJSConnection):
if user_profile.id != client.user_profile_id:
raise SocketAuthError("You are not the owner of the queue with id '%s'" % (queue_id,))
self.authenticated = True
register_connection(queue_id, self)
self.session.send_message({'req_id': msg['req_id'],
'response': {'result': 'success', 'msg': ''}})
self.authenticated = True
response = {'req_id': msg['req_id'], 'response': {'result': 'success', 'msg': ''}}
status_inquiries = msg['request'].get('status_inquiries')
if status_inquiries is not None:
results = {}
for inquiry in status_inquiries:
status = redis_client.hgetall(req_redis_key(self.client_id, inquiry))
if len(status) == 0:
status['status'] = 'not_received'
if 'response' in status:
status['response'] = ujson.loads(status['response'])
results[str(inquiry)] = status
response['response']['status_inquiries'] = results
self.session.send_message(response)
fake_log_line(self.session.conn_info, 0, 200, "Authenticated using %s" % (self.session.transport_name,),
user_profile.email)
ioloop = tornado.ioloop.IOLoop.instance()