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

Fix cannot stop Docker VM while console connection is still active.

Browse Source
This commit is contained in:
grossmj 2024-04-04 22:17:21 +07:00
parent ae64f15386
commit bc1a8c99d1
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,6 +575,9 @@ class DockerVM(BaseNode):
await self._start_vnc_process(restart=True) await self._start_vnc_process(restart=True)
monitor_process(self._vnc_process, self._vnc_callback) monitor_process(self._vnc_process, self._vnc_callback)
if self._console_websocket:
await self._console_websocket.close()
self._console_websocket = None
await self._clean_servers() await self._clean_servers()
await self.manager.query("POST", f"containers/{self._cid}/start") await self.manager.query("POST", f"containers/{self._cid}/start")
@ -837,9 +840,7 @@ class DockerVM(BaseNode):
f"containers/{self._cid}/attach/ws?stream=1&stdin=1&stdout=1&stderr=1" f"containers/{self._cid}/attach/ws?stream=1&stdin=1&stdout=1&stderr=1"
) )
input_stream.ws = self._console_websocket input_stream.ws = self._console_websocket
output_stream.feed_data(self.name.encode() + b" console is now available... Press RETURN to get started.\r\n") output_stream.feed_data(self.name.encode() + b" console is now available... Press RETURN to get started.\r\n")
asyncio.ensure_future(self._read_console_output(self._console_websocket, output_stream)) asyncio.ensure_future(self._read_console_output(self._console_websocket, output_stream))
async def _read_console_output(self, ws, out): async def _read_console_output(self, ws, out):
@ -862,13 +863,14 @@ class DockerVM(BaseNode):
out.feed_eof() out.feed_eof()
await ws.close() await ws.close()
break break
await self.stop()
async def reset_console(self): async def reset_console(self):
""" """
Reset the console. Reset the console.
""" """
if self._console_websocket:
await self._console_websocket.close()
await self._clean_servers() await self._clean_servers()
await self._start_console() await self._start_console()
@ -912,6 +914,9 @@ class DockerVM(BaseNode):
""" """
try: try:
if self._console_websocket:
await self._console_websocket.close()
self._console_websocket = None
await self._clean_servers() await self._clean_servers()
await self._stop_ubridge() await self._stop_ubridge()