ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-18 15:28:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ConnectionResetError issues and switch to aiohttp version 3.4.4. Fixes #1474.

Browse Source
This commit is contained in:
grossmj
2018-12-03 19:14:22 +08:00
parent 030714ae80
commit f76b329cba
8 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/handlers/api/controller/project_handler.py
View File

@ -229,11 +229,8 @@ class ProjectHandler:
await response.prepare(request)
with controller.notification.project_queue(project) as queue:
while True:
try:
msg = await queue.get_json(5)
await response.write(("{}\n".format(msg)).encode("utf-8"))
except asyncio.futures.CancelledError as e:
break
msg = await queue.get_json(5)
await response.write(("{}\n".format(msg)).encode("utf-8"))
if project.auto_close:
# To avoid trouble with client connecting disconnecting we sleep few seconds before checking
@ -263,16 +260,16 @@ class ProjectHandler:
request.app['websockets'].add(ws)
asyncio.ensure_future(process_websocket(ws))
with controller.notification.project_queue(project) as queue:
while True:
try:
try:
while True:
notification = await queue.get_json(5)
if ws.closed:
break
await ws.send_str(notification)
except asyncio.futures.CancelledError:
break
finally:
request.app['websockets'].discard(ws)
finally:
if not ws.closed:
await ws.close()
request.app['websockets'].discard(ws)
if project.auto_close:
# To avoid trouble with client connecting disconnecting we sleep few seconds before checking