arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
Code Issues Releases Wiki Activity

Fixes iouyap shutdown.

Browse Source
This commit is contained in:
Jeremy 2015-02-19 16:58:44 -07:00
parent 8d02f464c5
commit b393948b67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/modules/iou/iou_vm.py
View File

@ -474,7 +474,6 @@ class IOUVM(BaseVM):
self._iou_process.kill() self._iou_process.kill()
if self._iou_process.returncode is None: if self._iou_process.returncode is None:
log.warn("IOU process {} is still running".format(self._iou_process.pid)) log.warn("IOU process {} is still running".format(self._iou_process.pid))
self._iou_process = None self._iou_process = None
if self._iouyap_process is not None: if self._iouyap_process is not None:
@ -482,9 +481,10 @@ class IOUVM(BaseVM):
try: try:
yield from asyncio.wait_for(self._iouyap_process.wait(), timeout=3) yield from asyncio.wait_for(self._iouyap_process.wait(), timeout=3)
except asyncio.TimeoutError: except asyncio.TimeoutError:
self._iou_process.kill() self._iouyap_process.kill()
if self._iouyap_process.returncode is None: if self._iouyap_process.returncode is None:
log.warn("IOUYAP process {} is still running".format(self._iou_process.pid)) log.warn("IOUYAP process {} is still running".format(self._iouyap_process.pid))
self._iouyap_process = None
self._started = False self._started = False