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

Store the client name for the current handler in ClientDescriptor.

Browse Source
This commit is contained in:
Tim Abbott
2014-01-28 11:17:21 -05:00
committed by Tim Abbott
parent c7e3c3ce38
commit a9bf4b4cc7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/lib/event_queue.py
View File

@@ -60,6 +60,7 @@ class ClientDescriptor(object):
self.user_profile_email = user_profile_email self.user_profile_email = user_profile_email
self.realm_id = realm_id self.realm_id = realm_id
self.current_handler_id = None self.current_handler_id = None
self.current_client_name = None
self.event_queue = event_queue self.event_queue = event_queue
self.queue_timeout = lifespan_secs self.queue_timeout = lifespan_secs
self.event_types = event_types self.event_types = event_types
@@ -146,8 +147,9 @@ class ClientDescriptor(object):
return (self.current_handler_id is None return (self.current_handler_id is None
and now - self.last_connection_time >= self.queue_timeout) and now - self.last_connection_time >= self.queue_timeout)
def connect_handler(self, handler_id): def connect_handler(self, handler_id, client_name):
self.current_handler_id = handler_id self.current_handler_id = handler_id
self.current_client_name = client_name
set_descriptor_by_handler_id(handler_id, self) set_descriptor_by_handler_id(handler_id, self)
self.last_connection_time = time.time() self.last_connection_time = time.time()
def timeout_callback(): def timeout_callback():
@@ -161,14 +163,13 @@ class ClientDescriptor(object):
def disconnect_handler(self, client_closed=False): def disconnect_handler(self, client_closed=False):
if self.current_handler_id: if self.current_handler_id:
handler = get_handler_by_id(self.current_handler_id)
request = handler._request
delete_descriptor_by_handler_id(self.current_handler_id, None) delete_descriptor_by_handler_id(self.current_handler_id, None)
if client_closed: if client_closed:
logging.info("Client disconnected for queue %s (%s via %s)" % logging.info("Client disconnected for queue %s (%s via %s)" %
(self.event_queue.id, self.user_profile_email, (self.event_queue.id, self.user_profile_email,
request.client.name)) self.current_client_name))
self.current_handler_id = None self.current_handler_id = None
self.current_client_name = None
if self._timeout_handle is not None: if self._timeout_handle is not None:
ioloop = tornado.ioloop.IOLoop.instance() ioloop = tornado.ioloop.IOLoop.instance()
ioloop.remove_timeout(self._timeout_handle) ioloop.remove_timeout(self._timeout_handle)
@@ -481,7 +482,7 @@ def fetch_events(user_profile_id, user_profile_realm_id, user_profile_email,
if was_connected: if was_connected:
logging.info("Disconnected handler for queue %s (%s/%s)" % (queue_id, user_profile_email, logging.info("Disconnected handler for queue %s (%s/%s)" % (queue_id, user_profile_email,
user_client.name)) user_client.name))
client.connect_handler(handler_id) client.connect_handler(handler_id, user_client.name)
return (RespondAsynchronously, None) return (RespondAsynchronously, None)
# The following functions are called from Django # The following functions are called from Django