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

Wait longer for x11 socket file to be created. Ref #1761

Browse Source
This commit is contained in:
grossmj 2020-06-10 20:37:13 +09:30
parent 3940f013d4
commit f498ab06b4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,7 +615,10 @@ class DockerVM(BaseNode):
raise DockerError("Please install TigerVNC server (recommended) or Xvfb + x11vnc before using VNC support") raise DockerError("Please install TigerVNC server (recommended) or Xvfb + x11vnc before using VNC support")
await self._start_vnc_process() await self._start_vnc_process()
x11_socket = os.path.join("/tmp/.X11-unix/", "X{}".format(self._display)) x11_socket = os.path.join("/tmp/.X11-unix/", "X{}".format(self._display))
await wait_for_file_creation(x11_socket) try:
await wait_for_file_creation(x11_socket)
except asyncio.TimeoutError:
raise DockerError('x11 socket file "{}" does not exist'.format(x11_socket))
if not hasattr(sys, "_called_from_test") or not sys._called_from_test: if not hasattr(sys, "_called_from_test") or not sys._called_from_test:
# Start vncconfig for tigervnc clipboard support, connection available only after socket creation. # Start vncconfig for tigervnc clipboard support, connection available only after socket creation.

2
gns3server/utils/asyncio/__init__.py
View File

@ -126,7 +126,7 @@ def monitor_process(process, termination_callback):
asyncio.ensure_future(_check_process(process, termination_callback)) asyncio.ensure_future(_check_process(process, termination_callback))
async def wait_for_file_creation(path, timeout=10): async def wait_for_file_creation(path, timeout=60):
while timeout > 0: while timeout > 0:
if os.path.exists(path): if os.path.exists(path):