arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Bump version to 1.2.1.dev2

Browse Source
This commit is contained in:
Jeremy 2014-12-02 18:52:28 -07:00
parent 8f53d51c05
commit 5a468888c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/modules/qemu/qemu_vm.py
View File

@ -689,7 +689,7 @@ class QemuVM(object):
if self._cpulimit_process and self._cpulimit_process.poll() is None: if self._cpulimit_process and self._cpulimit_process.poll() is None:
self._cpulimit_process.kill() self._cpulimit_process.kill()
try: try:
self._process.wait(1) self._process.wait(3)
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
log.error("could not kill cpulimit process {}".format(self._cpulimit_process.pid)) log.error("could not kill cpulimit process {}".format(self._cpulimit_process.pid))
@ -709,7 +709,7 @@ class QemuVM(object):
subprocess.Popen([cpulimit_exec, "--lazy", "--pid={}".format(self._process.pid), "--limit={}".format(self._cpu_throttling)], cwd=self._working_dir) subprocess.Popen([cpulimit_exec, "--lazy", "--pid={}".format(self._process.pid), "--limit={}".format(self._cpu_throttling)], cwd=self._working_dir)
log.info("CPU throttled to {}%".format(self._cpu_throttling)) log.info("CPU throttled to {}%".format(self._cpu_throttling))
except FileNotFoundError: except FileNotFoundError:
raise QemuError("cpulimit could not be found, please deactivate CPU throttling") raise QemuError("cpulimit could not be found, please install it or deactivate CPU throttling")
except subprocess.SubprocessError as e: except subprocess.SubprocessError as e:
raise QemuError("Could not throttle CPU: {}".format(e)) raise QemuError("Could not throttle CPU: {}".format(e))

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.2.1.dev1" __version__ = "1.2.1.dev2"
__version_info__ = (1, 2, 1, 99) __version_info__ = (1, 2, 1, 99)