Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't send heartbeat events to clients that don't request them. 

(imported from commit 1147814b22fb9737a807057ddbdbe0e9554086e0)
This commit is contained in:
Tim Abbott 2013-11-18 11:29:45 -05:00
parent 14f6625569
commit 74c304ae40
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/lib/event_queue.py
View File

@ -98,13 +98,16 @@ class ClientDescriptor(object):
def connect_handler(self, handler):
self.current_handler = handler
self.last_connection_time = time.time()
def timeout_callback():
self._timeout_handle = None
# All clients get heartbeat events
self.add_event(dict(type='heartbeat'))
ioloop = tornado.ioloop.IOLoop.instance()
heartbeat_time = time.time() + HEARTBEAT_MIN_FREQ_SECS + random.randint(0, 10)
self._timeout_handle = ioloop.add_timeout(heartbeat_time, timeout_callback)
if self.accepts_event_type('heartbeat'):
def timeout_callback():
self._timeout_handle = None
# We already checked whether the client accepts heartbeats
self.add_event(dict(type='heartbeat'))
ioloop = tornado.ioloop.IOLoop.instance()
heartbeat_time = time.time() + HEARTBEAT_MIN_FREQ_SECS + random.randint(0, 10)
self._timeout_handle = ioloop.add_timeout(heartbeat_time, timeout_callback)
logging.info("DEBUG: connected handler for queue %s" % (self.event_queue.id,))
def disconnect_handler(self):