paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix connection not being closed cleanly on event queue GC.

Browse Source 
Apparently, our event queue garbage collection logic never actually
disconnected any existing handler objects.

We fix this by disconnecting the handler inside cleanup(), adding a
special check to avoid creating a pointless timeout object.
This commit is contained in:
Tim Abbott
2016-03-20 16:08:08 -07:00
parent 3f55e26a9f
commit 0b96e5e43f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/event_queue.py
View File

@@ -160,7 +160,7 @@ class ClientDescriptor(object):
if self.client_type_name != 'API: heartbeat test':
self._timeout_handle = ioloop.add_timeout(heartbeat_time, timeout_callback)
def disconnect_handler(self, client_closed=False):
def disconnect_handler(self, client_closed=False, need_timeout=True):
if self.current_handler_id:
clear_descriptor_by_handler_id(self.current_handler_id, None)
clear_handler_by_id(self.current_handler_id)
@@ -170,12 +170,15 @@ class ClientDescriptor(object):
self.current_client_name))
self.current_handler_id = None
self.current_client_name = None
if self._timeout_handle is not None:
if need_timeout and self._timeout_handle is not None:
ioloop = tornado.ioloop.IOLoop.instance()
ioloop.remove_timeout(self._timeout_handle)
self._timeout_handle = None
def cleanup(self):
# Disconnect any existing handler, and don't bother creating a
# timeout object that we'll just have to garbage collect later.
self.disconnect_handler(need_timeout=False)
do_gc_event_queues([self.event_queue.id], [self.user_profile_id],
[self.realm_id])