mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-12-23 22:52:25 +00:00
Fix IOU closing
This commit is contained in:
parent
15f89776d3
commit
018e3c1451
@ -110,8 +110,10 @@ class IOUVM(BaseVM):
|
||||
else:
|
||||
self._console = self._manager.port_manager.get_free_console_port()
|
||||
|
||||
@asyncio.coroutine
|
||||
def close(self):
|
||||
|
||||
yield from self.stop()
|
||||
if self._console:
|
||||
self._manager.port_manager.release_console_port(self._console)
|
||||
self._console = None
|
||||
@ -498,6 +500,7 @@ class IOUVM(BaseVM):
|
||||
Stops the IOU process.
|
||||
"""
|
||||
|
||||
if self.is_running():
|
||||
# stop console support
|
||||
if self._ioucon_thread:
|
||||
self._ioucon_thread_stop_event.set()
|
||||
@ -505,7 +508,6 @@ class IOUVM(BaseVM):
|
||||
self._ioucon_thread.join(timeout=3.0) # wait for the thread to free the console port
|
||||
self._ioucon_thread = None
|
||||
|
||||
if self.is_running():
|
||||
self._terminate_process_iou()
|
||||
try:
|
||||
yield from asyncio.wait_for(self._iou_process.wait(), timeout=3)
|
||||
|
@ -357,6 +357,7 @@ class TelnetServer(Console):
|
||||
sock_fd.listen(socket.SOMAXCONN)
|
||||
self.sock_fd = sock_fd
|
||||
log.info("Telnet server ready for connections on {}:{}".format(self.addr, self.port))
|
||||
log.info(self.stop_event.is_set())
|
||||
|
||||
return self
|
||||
|
||||
|
@ -73,6 +73,7 @@ class VPCSVM(BaseVM):
|
||||
else:
|
||||
self._console = self._manager.port_manager.get_free_console_port()
|
||||
|
||||
@asyncio.coroutine
|
||||
def close(self):
|
||||
|
||||
self._terminate_process()
|
||||
|
Loading…
Reference in New Issue
Block a user