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

Fixed calling on_connect() so that it is called only once; fixes #31

Browse source
This commit is contained in:
Roy Hyunjin Han 2013-11-20 08:07:07 -08:00
commit 38e72dc304
6 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
socketIO_client/__init__.py
View file

@ -148,7 +148,6 @@ class SocketIO(object):
if path:
self._transport.connect(path)
namespace = Namespace(self._transport, path)
namespace.on_connect()
self._namespace_by_path[path] = namespace
return namespace
@ -173,11 +172,7 @@ class SocketIO(object):
for elapsed_time in warning_screen:
try:
try:
for packet in self._transport.recv_packet():
try:
self._process_packet(packet)
except PacketError as e:
_log.warn('[packet error] %s', e)
self._process_events()
except TimeoutError:
pass
if self._stop_waiting(for_callbacks):
@ -193,6 +188,21 @@ class SocketIO(object):
except KeyboardInterrupt:
pass
def _process_events(self):
for packet in self._transport.recv_packet():
try:
self._process_packet(packet)
except PacketError as e:
_log.warn('[packet error] %s', e)
def _process_packet(self, packet):
logging.debug('xxx')
logging.debug(packet)
code, packet_id, path, data = packet
namespace = self.get_namespace(path)
delegate = self._get_delegate(code)
delegate(packet, namespace._find_event_callback)
def _stop_waiting(self, for_callbacks):
# Use __transport to make sure that we do not reconnect inadvertently
if for_callbacks and not self.__transport.has_ack_callback:
@ -264,12 +274,6 @@ class SocketIO(object):
heartbeat_time = elapsed_time
self._transport.send_heartbeat()
def _process_packet(self, packet):
code, packet_id, path, data = packet
namespace = self.get_namespace(path)
delegate = self._get_delegate(code)
delegate(packet, namespace._find_event_callback)
def get_namespace(self, path=''):
try:
return self._namespace_by_path[path]