arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 03:08:14 +00:00
Code Issues 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
commit 6a6beb752a
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -44,6 +44,13 @@
* Don't delete Dynamips ROM files. They are used to restore the nvram. * Don't delete Dynamips ROM files. They are used to restore the nvram.
* Adds pywin32 dependency in setup.py for Windows. * Adds pywin32 dependency in setup.py for Windows.
## 1.3.10 04/09/2015
* Catch exception when a process cannot be killed. Fixes #296.
* Backport: fixes NAT NIO for Qemu VMs (do not launch any legacy scripts)
* Fixes Unicode error. Fixes #290.
* Don't delete Dynamips ROM files. They are used to restore the nvram.
## 1.4.0beta1 07/08/2015 ## 1.4.0beta1 07/08/2015
* Fix ram setting for Qemu * Fix ram setting for Qemu

7
gns3server/modules/dynamips/hypervisor.py
View File

@ -151,7 +151,12 @@ class Hypervisor(DynamipsHypervisor):
except asyncio.TimeoutError: except asyncio.TimeoutError:
if self._process.returncode is None: if self._process.returncode is None:
log.warn("Dynamips process {} is still running... killing it".format(self._process.pid)) 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): if self._stdout_file and os.access(self._stdout_file, os.W_OK):
try: try:

5
gns3server/modules/vpcs/vpcs_vm.py
View File

@ -271,11 +271,12 @@ class VPCSVM(BaseVM):
yield from wait_for_process_termination(self._process, timeout=3) yield from wait_for_process_termination(self._process, timeout=3)
except asyncio.TimeoutError: except asyncio.TimeoutError:
if self._process.returncode is None: if self._process.returncode is None:
log.warn("VPCS process {} is still running... killing it".format(self._process.pid))
try: try:
self._process.kill() self._process.kill()
except OSError as e: 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._process = None
self._started = False self._started = False

2
gns3server/version.py
View File

@ -23,5 +23,5 @@
# or negative for a release candidate or beta (after the base version # or negative for a release candidate or beta (after the base version
# number has been incremented) # number has been incremented)
__version__ = "1.4.0dev8" __version__ = "1.4.0.dev8"
__version_info__ = (1, 4, 0, 8) __version_info__ = (1, 4, 0, 8)