ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-23 14:42:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle 2016-10-28 11:39:16 +02:00
commit 9d94c47fc8
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,14 +547,19 @@ class IOUVM(BaseNode):
:param returncode: Process returncode
"""
log.info("{} process has stopped, return code: {}".format(process_name, returncode))
self._terminate_process_iou()
self._terminate_process_iouyap()
self._ioucon_thread_stop_event.set()
if returncode != 0:
self.project.emit("log.error", {"message": "{} process has stopped, return code: {}\n{}".format(process_name,
returncode,
self.read_iou_stdout())})
log.info("{} process has stopped, return code: {}".format(process_name, returncode))
else:
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())
else:
message = "{} process has stopped, return code: {}\n{}".format(process_name, returncode, self.read_iou_stdout())
log.warn(message)
self.project.emit("log.error", {"message": message})
def _rename_nvram_file(self):
"""

2
gns3server/compute/virtualbox/__init__.py
View File

@ -68,7 +68,7 @@ class VirtualBox(BaseManager):
else:
vboxmanage_path = "vboxmanage"
if not os.path.abspath(vboxmanage_path):
if not os.path.isabs(vboxmanage_path):
vboxmanage_path = shutil.which(vboxmanage_path)
if not vboxmanage_path:

2
gns3server/compute/vmware/__init__.py
View File

@ -107,7 +107,7 @@ class VMware(BaseManager):
else:
vmrun_path = "vmrun"
if not os.path.abspath(vmrun_path):
if not os.path.isabs(vmrun_path):
vmrun_path = shutil.which(vmrun_path)
if not vmrun_path: