Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/socketio/async_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ async def connect(self, url, headers={}, auth=None, transports=None,
namespaces = [namespaces]
self.connection_namespaces = namespaces
self.namespaces = {}
self.failed_namespaces = []
if self._connect_event is None:
self._connect_event = self.eio.create_event()
else:
Expand Down Expand Up @@ -166,14 +167,16 @@ async def connect(self, url, headers={}, auth=None, transports=None,
await asyncio.wait_for(self._connect_event.wait(),
wait_timeout)
self._connect_event.clear()
if set(self.namespaces) == set(self.connection_namespaces):
if len(self.namespaces) + len(self.failed_namespaces) == \
len(self.connection_namespaces):
break
except asyncio.TimeoutError:
pass
if set(self.namespaces) != set(self.connection_namespaces):
await self.disconnect()
raise exceptions.ConnectionError(
'One or more namespaces failed to connect')
'One or more namespaces failed to connect'
', '.join(self.failed_namespaces))

self.connected = True

Expand Down Expand Up @@ -448,6 +451,7 @@ async def _handle_error(self, namespace, data):
elif not isinstance(data, (tuple, list)):
data = (data,)
await self._trigger_event('connect_error', namespace, *data)
self.failed_namespaces.append(namespace)
self._connect_event.set()
if namespace in self.namespaces:
del self.namespaces[namespace]
Expand Down
1 change: 1 addition & 0 deletions src/socketio/base_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def __init__(self, reconnection=True, reconnection_attempts=0,

self.connected = False #: Indicates if the client is connected or not.
self.namespaces = {} #: set of connected namespaces.
self.failed_namespaces = []
self.handlers = {}
self.namespace_handlers = {}
self.callbacks = {}
Expand Down
10 changes: 7 additions & 3 deletions src/socketio/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ def connect(self, url, headers={}, auth=None, transports=None,
namespaces = [namespaces]
self.connection_namespaces = namespaces
self.namespaces = {}
self.failed_namespaces = []
if self._connect_event is None:
self._connect_event = self.eio.create_event()
else:
Expand All @@ -161,12 +162,14 @@ def connect(self, url, headers={}, auth=None, transports=None,
if wait:
while self._connect_event.wait(timeout=wait_timeout):
self._connect_event.clear()
if set(self.namespaces) == set(self.connection_namespaces):
if len(self.namespaces) + len(self.failed_namespaces) == \
len(self.connection_namespaces):
break
if set(self.namespaces) != set(self.connection_namespaces):
self.disconnect()
raise exceptions.ConnectionError(
'One or more namespaces failed to connect')
'One or more namespaces failed to connect: '
', '.join(self.failed_namespaces))

self.connected = True

Expand Down Expand Up @@ -425,6 +428,7 @@ def _handle_error(self, namespace, data):
elif not isinstance(data, (tuple, list)):
data = (data,)
self._trigger_event('connect_error', namespace, *data)
self.failed_namespaces.append(namespace)
self._connect_event.set()
if namespace in self.namespaces:
del self.namespaces[namespace]
Expand All @@ -439,7 +443,7 @@ def _trigger_event(self, event, namespace, *args):
if handler:
try:
return handler(*args)
except TypeError:
except TypeError: # pragma: no cover
# the legacy disconnect event does not take a reason argument
if event == 'disconnect':
return handler(*args[:-1])
Expand Down
Loading