arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-23 23:38:21 +00:00
Code Issues Releases Wiki Activity

Fix non responsive console for Docker VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2645

Browse Source
This commit is contained in:
grossmj 2018-11-30 17:06:21 +08:00
parent 56412b35e0
commit bec2270334
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/compute/docker/docker_vm.py
View File

@ -643,7 +643,7 @@ class DockerVM(BaseNode):
async def drain(self):
if not self.ws.closed:
self.ws.send_bytes(self._data)
await self.ws.send_bytes(self._data)
self._data = b""
output_stream = asyncio.StreamReader()
@ -671,15 +671,15 @@ class DockerVM(BaseNode):
while True:
msg = await ws.receive()
if msg.tp == aiohttp.WSMsgType.text:
if msg.type == aiohttp.WSMsgType.text:
out.feed_data(msg.data.encode())
elif msg.tp == aiohttp.WSMsgType.BINARY:
elif msg.type == aiohttp.WSMsgType.BINARY:
out.feed_data(msg.data)
elif msg.tp == aiohttp.WSMsgType.ERROR:
log.critical("Docker WebSocket Error: {}".format(msg.data))
elif msg.type == aiohttp.WSMsgType.ERROR:
log.critical("Docker WebSocket Error: {}".format(ws.exception()))
else:
out.feed_eof()
ws.close()
await ws.close()
break
await self.stop()