arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
Code Issues Releases Wiki Activity

Catch error when cannot resize Docker container TTY.

Browse Source
This commit is contained in:
grossmj 2024-11-07 14:52:59 +10:00
parent fb06eb3c0c
commit f3749e83ec
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/compute/base_node.py
View File

@ -406,13 +406,11 @@ class BaseNode:
Stops the telnet proxy. Stops the telnet proxy.
""" """
if self._wrapper_telnet_server: if self._wrap_console_writer:
self._wrap_console_writer.close() self._wrap_console_writer.close()
if sys.version_info >= (3, 7, 0):
try:
await self._wrap_console_writer.wait_closed() await self._wrap_console_writer.wait_closed()
except ConnectionResetError: self._wrap_console_writer = None
pass if self._wrapper_telnet_server:
self._wrapper_telnet_server.close() self._wrapper_telnet_server.close()
await self._wrapper_telnet_server.wait_closed() await self._wrapper_telnet_server.wait_closed()
self._wrapper_telnet_server = None self._wrapper_telnet_server = None

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

@ -710,7 +710,10 @@ class DockerVM(BaseNode):
""" """
# resize the container TTY. # resize the container TTY.
try:
await self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns)) await self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns))
except DockerError as e:
log.warning(f"Could not resize the container TTY: {e}")
async def _start_console(self): async def _start_console(self):
""" """