Merge branch 'dabidan-patch-1'

This commit is contained in:
Roy Hyunjin Han 2015-02-15 10:38:15 -05:00
commit c19f9891e6

View file

@ -250,7 +250,7 @@ class SocketIO(object):
self._process_events()
except TimeoutError:
pass
self.heartbeat_pacemaker.send(elapsed_time)
self.heartbeat_pacemaker.next()
except ConnectionError as e:
try:
warning = Exception('[connection error] %s' % e)
@ -344,11 +344,11 @@ class SocketIO(object):
return transport
def _make_heartbeat_pacemaker(self, heartbeat_interval):
heartbeat_time = 0
heartbeat_time = time.time()
while True:
elapsed_time = (yield)
if elapsed_time - heartbeat_time > heartbeat_interval:
heartbeat_time = elapsed_time
yield
if time.time() - heartbeat_time > heartbeat_interval:
heartbeat_time = time.time()
self._transport.send_heartbeat()
def get_namespace(self, path=''):