arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Improve error message when IOU VM process is unexpectedly stopped.

Browse Source
This commit is contained in:
grossmj 2017-10-22 16:28:54 +07:00
parent b4307e6035
commit 8930b4c6e5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gns3server/compute/iou/iou_vm.py
View File

@ -564,13 +564,14 @@ class IOUVM(BaseNode):
""" """
self._terminate_process_iou() self._terminate_process_iou()
if returncode != 0: if returncode != 0:
if returncode == -11: if returncode == -11:
message = "{} process has stopped, return code: {}. This could be an issue with the image using a different image can fix the issue.\n{}".format(process_name, returncode, self.read_iou_stdout()) message = 'IOU VM "{}" process has stopped with return code: {} (segfault). This could be an issue with the IOU image, using a different image may fix this.\n{}'.format(self.name,
returncode,
self.read_iou_stdout())
else: else:
message = "{} process has stopped, return code: {}\n{}".format(process_name, returncode, self.read_iou_stdout()) message = 'IOU VM "{}" process has stopped with return code: {}\n{}'.format(self.name, returncode, self.read_iou_stdout())
log.warn(message) log.warning(message)
self.project.emit("log.error", {"message": message}) self.project.emit("log.error", {"message": message})
if self._telnet_server: if self._telnet_server:
self._telnet_server.close() self._telnet_server.close()
@ -610,7 +611,7 @@ class IOUVM(BaseNode):
yield from gns3server.utils.asyncio.wait_for_process_termination(self._iou_process, timeout=3) yield from gns3server.utils.asyncio.wait_for_process_termination(self._iou_process, timeout=3)
except asyncio.TimeoutError: except asyncio.TimeoutError:
if self._iou_process.returncode is None: if self._iou_process.returncode is None:
log.warn("IOU process {} is still running... killing it".format(self._iou_process.pid)) log.warning("IOU process {} is still running... killing it".format(self._iou_process.pid))
try: try:
self._iou_process.kill() self._iou_process.kill()
except ProcessLookupError: except ProcessLookupError: