ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-17 06:48:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

7
gns3server/modules/dynamips/hypervisor.py
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: