Fixes iouyap shutdown.

pull/100/head
Jeremy 10 years ago
parent 8d02f464c5
commit b393948b67

@ -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

Loading…
Cancel
Save