paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish event handlers when disconnecting from an event queue.

Browse Source 
This should help prevent timeouts from clients whose requests have
been supplanted.

(imported from commit fdb3a89c4ec02bb23d0fba50ea558d48cb786916)
This commit is contained in:
Tim Abbott
2013-12-12 12:59:02 -05:00
parent 950e4c800b
commit cc0ce6b437
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/event_queue.py
View File

@@ -91,8 +91,15 @@ class ClientDescriptor(object):
async_request_restart(self.current_handler._request)
self.event_queue.push(event)
self.finish_current_handler()
def finish_current_handler(self):
if self.current_handler is not None:
try:
# We call async_request_restart here in case we are
# being finished without any events (because another
# get_events request has supplanted this request)
async_request_restart(self.current_handler._request)
self.current_handler._request._log_data['extra'] = "[%s/1]" % (self.event_queue.id,)
self.current_handler.zulip_finish(dict(result='success', msg='',
events=self.event_queue.contents(),
@@ -100,9 +107,11 @@ class ClientDescriptor(object):
self.current_handler._request,
apply_markdown=self.apply_markdown)
except Exception:
logging.exception("Got error adding event to queue %s" % (self.event_queue.id))
logging.exception("Got error finishing handler for queue %s" % (self.event_queue.id))
finally:
self.disconnect_handler()
return True
return False
def accepts_event_type(self, type):
if self.event_types is None:
@@ -129,13 +138,11 @@ class ClientDescriptor(object):
self._timeout_handle = ioloop.add_timeout(heartbeat_time, timeout_callback)
def disconnect_handler(self):
was_connected = (self.current_handler is not None)
self.current_handler = None
if self._timeout_handle is not None:
ioloop = tornado.ioloop.IOLoop.instance()
ioloop.remove_timeout(self._timeout_handle)
self._timeout_handle = None
return was_connected
def cleanup(self):
do_gc_event_queues([self.event_queue.id], [self.user_profile_id],