Skip to content
Closed
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
2 changes: 1 addition & 1 deletion src/socketio/async_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ async def _handle_disconnect(self, namespace):
del self.namespaces[namespace]
if not self.namespaces:
self.connected = False
await self.eio.disconnect(abort=True)
await self.eio.disconnect()

async def _handle_event(self, namespace, id, data):
namespace = namespace or '/'
Expand Down
2 changes: 1 addition & 1 deletion src/socketio/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ def _handle_disconnect(self, namespace):
del self.namespaces[namespace]
if not self.namespaces:
self.connected = False
self.eio.disconnect(abort=True)
self.eio.disconnect()

def _handle_event(self, namespace, id, data):
namespace = namespace or '/'
Expand Down
16 changes: 8 additions & 8 deletions tests/async/test_admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from functools import wraps
import logging
import threading
import time
from unittest import mock
Expand All @@ -21,7 +22,8 @@ def with_instrumented_server(auth=False, **ikwargs):
def decorator(f):
@wraps(f)
def wrapped(self, *args, **kwargs):
sio = socketio.AsyncServer(async_mode='asgi')
sio = socketio.AsyncServer(async_mode='asgi', logger=True,
engineio_logger=True)

@sio.event
async def enter_room(sid, data):
Expand All @@ -37,6 +39,7 @@ def connect(sid, environ, auth):

async def shutdown():
await self.isvr.shutdown()
self.isvr.uninstrument()
await sio.shutdown()

if 'server_stats_interval' not in ikwargs:
Expand All @@ -46,9 +49,8 @@ async def shutdown():
server = SocketIOWebServer(sio, on_shutdown=shutdown)
server.start()

# import logging
# logging.getLogger('engineio.client').setLevel(logging.DEBUG)
# logging.getLogger('socketio.client').setLevel(logging.DEBUG)
logging.getLogger('engineio.client').setLevel(logging.DEBUG)
logging.getLogger('socketio.client').setLevel(logging.DEBUG)

original_schedule_ping = EngineIOSocket.schedule_ping
EngineIOSocket.schedule_ping = mock.MagicMock()
Expand All @@ -57,14 +59,12 @@ async def shutdown():
ret = f(self, *args, **kwargs)
finally:
server.stop()
self.isvr.uninstrument()
self.isvr = None

EngineIOSocket.schedule_ping = original_schedule_ping

# import logging
# logging.getLogger('engineio.client').setLevel(logging.NOTSET)
# logging.getLogger('socketio.client').setLevel(logging.NOTSET)
logging.getLogger('engineio.client').setLevel(logging.NOTSET)
logging.getLogger('socketio.client').setLevel(logging.NOTSET)

return ret
return wrapped
Expand Down
16 changes: 8 additions & 8 deletions tests/common/test_admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from functools import wraps
import logging
import threading
import time
from unittest import mock
Expand All @@ -18,7 +19,8 @@ def with_instrumented_server(auth=False, **ikwargs):
def decorator(f):
@wraps(f)
def wrapped(self, *args, **kwargs):
sio = socketio.Server(async_mode='threading')
sio = socketio.Server(async_mode='threading', logger=True,
engineio_logger=True)

@sio.event
def enter_room(sid, data):
Expand All @@ -39,26 +41,24 @@ def connect(sid, environ, auth):
server = SocketIOWebServer(sio)
server.start()

# import logging
# logging.getLogger('engineio.client').setLevel(logging.DEBUG)
# logging.getLogger('socketio.client').setLevel(logging.DEBUG)
logging.getLogger('engineio.client').setLevel(logging.DEBUG)
logging.getLogger('socketio.client').setLevel(logging.DEBUG)

original_schedule_ping = EngineIOSocket.schedule_ping
EngineIOSocket.schedule_ping = mock.MagicMock()

try:
ret = f(self, *args, **kwargs)
finally:
server.stop()
self.isvr.shutdown()
self.isvr.uninstrument()
self.isvr = None
server.stop()

EngineIOSocket.schedule_ping = original_schedule_ping

# import logging
# logging.getLogger('engineio.client').setLevel(logging.NOTSET)
# logging.getLogger('socketio.client').setLevel(logging.NOTSET)
logging.getLogger('engineio.client').setLevel(logging.NOTSET)
logging.getLogger('socketio.client').setLevel(logging.NOTSET)

return ret
return wrapped
Expand Down
Loading