NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ProcessLookupError X11VNC

Browse Source 
Fix #534
This commit is contained in:
Julien Duponchelle 2016-05-19 13:23:53 +02:00
parent a741662636
commit 2bb062c61e
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,11 +543,16 @@ class DockerVM(BaseVM):
try:
if self.console_type == "vnc":
if self._x11vnc_process:
self._x11vnc_process.terminate()
self._xvfb_process.terminate()
yield from self._x11vnc_process.wait()
yield from self._xvfb_process.wait()
try:
self._x11vnc_process.terminate()
yield from self._x11vnc_process.wait()
except ProcessLookupError:
pass
try:
self._xvfb_process.terminate()
yield from self._xvfb_process.wait()
except ProcessLookupError:
pass
state = yield from self._get_container_state()
if state == "paused" or state == "running":
yield from self.stop()