From 12a5a3a6e1b60689f40f4ca2bfad7a40645ede1f Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 20 Mar 2016 16:12:37 -0700 Subject: [PATCH] Actually fix main Tornado memory leak of handler objects. This line appears to have been lost in rebasing from the original implementation of 1396eb7022faec4c2d91553800a35781a96dd5bd; so the previous fix actually only addressed the issue in a rare exception case. --- zerver/lib/event_queue.py | 1 + 1 file changed, 1 insertion(+) diff --git a/zerver/lib/event_queue.py b/zerver/lib/event_queue.py index 6587c2e7ef..72b302c687 100644 --- a/zerver/lib/event_queue.py +++ b/zerver/lib/event_queue.py @@ -163,6 +163,7 @@ class ClientDescriptor(object): def disconnect_handler(self, client_closed=False): if self.current_handler_id: clear_descriptor_by_handler_id(self.current_handler_id, None) + clear_handler_by_id(self.current_handler_id) if client_closed: logging.info("Client disconnected for queue %s (%s via %s)" % (self.event_queue.id, self.user_profile_email,