From b393948b67014075dbc9ef5033a5460c75f2bda8 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 19 Feb 2015 16:58:44 -0700 Subject: [PATCH] Fixes iouyap shutdown. --- gns3server/modules/iou/iou_vm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gns3server/modules/iou/iou_vm.py b/gns3server/modules/iou/iou_vm.py index ab0d064d..7751cd3e 100644 --- a/gns3server/modules/iou/iou_vm.py +++ b/gns3server/modules/iou/iou_vm.py @@ -474,7 +474,6 @@ class IOUVM(BaseVM): self._iou_process.kill() if self._iou_process.returncode is None: log.warn("IOU process {} is still running".format(self._iou_process.pid)) - self._iou_process = None if self._iouyap_process is not None: @@ -482,9 +481,10 @@ class IOUVM(BaseVM): try: yield from asyncio.wait_for(self._iouyap_process.wait(), timeout=3) except asyncio.TimeoutError: - self._iou_process.kill() + self._iouyap_process.kill() 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