Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-07-05 15:41:53 +02:00
commit ca4d09ea40
6 files changed
+39 -13

No files matched your search

+4 -1
View File
@@ -679,7 +679,10 @@ class IOUVM(BaseNode):
except asyncio.TimeoutError:
if self._iou_process.returncode is None:
log.warn("IOU process {} is still running... killing it".format(self._iou_process.pid))
self._iou_process.kill()
try:
self._iou_process.kill()
except ProcessLookupError:
pass
self._iou_process = None
if self.is_iouyap_running():