NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into unstable

Browse Source
This commit is contained in:
Julien Duponchelle committed 2015-09-22 11:03:41 +02:00
2 parents 2c3d7510be 2a0f1586c8
commit 6a6beb752a
4 files changed
+17 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/modules/dynamips/hypervisor.py
+6 -1
View File
@@ -151,7 +151,12 @@ class Hypervisor(DynamipsHypervisor):
except asyncio.TimeoutError:
if self._process.returncode is None:
log.warn("Dynamips process {} is still running... killing it".format(self._process.pid))
self._process.kill()
try:
self._process.kill()
except OSError as e:
log.error("Cannot stop the Dynamips process: {}".format(e))
if self._process.returncode is None:
log.warn('Dynamips hypervisor with PID={} is still running'.format(self._process.pid))
if self._stdout_file and os.access(self._stdout_file, os.W_OK):
try:
gns3server/modules/vpcs/vpcs_vm.py
+3 -2
View File
@@ -271,11 +271,12 @@ class VPCSVM(BaseVM):
yield from wait_for_process_termination(self._process, timeout=3)
except asyncio.TimeoutError:
if self._process.returncode is None:
log.warn("VPCS process {} is still running... killing it".format(self._process.pid))
try:
self._process.kill()
except OSError as e:
raise VPCSError("Can not stop the VPCS process: {}".format(e))
log.error("Cannot stop the VPCS process: {}".format(e))
if self._process.returncode is None:
log.warn('VPCS VM "{}" with PID={} is still running'.format(self._name, self._process.pid))
self._process = None
self._started = False