arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-06-26 01:42:39 +00:00
Code Issues Releases Wiki Activity

Ensure in all cases the docker console is closed before restart

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1226
This commit is contained in:
Julien Duponchelle 2016-05-10 11:38:50 +02:00
parent c7d58eb3b3
commit 28f7c2a1cd
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/modules/docker/docker_vm.py
View File

@ -326,6 +326,8 @@ class DockerVM(BaseVM):
if state == "paused": if state == "paused":
yield from self.unpause() yield from self.unpause()
else: else:
yield from self._clean_servers()
result = yield from self.manager.query("POST", "containers/{}/start".format(self._cid)) result = yield from self.manager.query("POST", "containers/{}/start".format(self._cid))
namespace = yield from self._get_namespace() namespace = yield from self._get_namespace()
@ -473,16 +475,23 @@ class DockerVM(BaseVM):
log.info("Docker container '{name}' [{image}] restarted".format( log.info("Docker container '{name}' [{image}] restarted".format(
name=self._name, image=self._image)) name=self._name, image=self._image))
@asyncio.coroutine
def _clean_servers(self):
"""
Clean the list of running console servers
"""
if len(self._telnet_servers) > 0:
for telnet_server in self._telnet_servers:
telnet_server.close()
yield from telnet_server.wait_closed()
self._telnet_servers = []
@asyncio.coroutine @asyncio.coroutine
def stop(self): def stop(self):
"""Stops this Docker container.""" """Stops this Docker container."""
try: try:
if len(self._telnet_servers) > 0: yield from self._clean_servers()
for telnet_server in self._telnet_servers:
telnet_server.close()
yield from telnet_server.wait_closed()
self._telnet_servers = []
if self._ubridge_hypervisor and self._ubridge_hypervisor.is_running(): if self._ubridge_hypervisor and self._ubridge_hypervisor.is_running():
yield from self._ubridge_hypervisor.stop() yield from self._ubridge_hypervisor.stop()