jyapayne/socketIO-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge conflicts

Browse source
This commit is contained in:
Roy Hyunjin Han 2015-02-15 10:37:56 -05:00
commit 47b5f2dd69
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
socketIO_client/__init__.py
View file

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