diff --git a/.coverage.atlantis.6236.785802 b/.coverage.atlantis.6236.785802 deleted file mode 100644 index 52f67bce..00000000 --- a/.coverage.atlantis.6236.785802 +++ /dev/null @@ -1 +0,0 @@ -!coverage.py: This is a private format, don't read it directly!{"lines": {"/Users/noplay/code/gns3/gns3-server/gns3server/modules/docker/docker_vm.py": [20, 22, 23, 24, 25, 27, 28, 29, 30, 31, 32, 34, 35, 38, 46, 48, 49, 51, 52, 53, 54, 55, 56, 57, 58, 60, 62, 63, 64, 65, 66, 68, 77, 82, 89, 91, 92, 93, 94, 95, 97, 101, 102, 103, 104, 105, 106, 109, 112, 113, 114, 115, 116, 118, 122, 123, 124, 126, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 142, 143, 144, 145, 146, 147, 148, 149, 155, 156, 157, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 197, 198, 199, 215, 216, 217, 273, 274, 275, 285, 286, 287, 291, 292, 298, 299, 300, 301, 302, 303, 304, 306, 307, 308, 332, 333, 334, 339, 340, 341, 342, 343, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360], "/Users/noplay/code/gns3/gns3-server/gns3server/modules/docker/__init__.py": [20, 22, 23, 24, 25, 26, 27, 29, 31, 32, 33, 34, 37, 39, 41, 42, 44, 45, 47, 48, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, 69, 70, 72, 79, 80, 81, 82, 83], "/Users/noplay/code/gns3/gns3-server/gns3server/modules/docker/docker_error.py": [20, 22, 25, 26]}} \ No newline at end of file diff --git a/README.rst b/README.rst index e1ab30af..f97251ad 100644 --- a/README.rst +++ b/README.rst @@ -22,8 +22,10 @@ master master is the next stable release, you can test it in your day to day activities. Bug fixes or small improvements pull requests go here. -unstable +1.x (1.4 for example) ******** +Next major release + *Never* use this branch for production. Pull requests for major new features go here. Linux diff --git a/gns3server/modules/project.py b/gns3server/modules/project.py index 4e758406..26604066 100644 --- a/gns3server/modules/project.py +++ b/gns3server/modules/project.py @@ -459,6 +459,13 @@ class Project: self._listeners.remove(queue) + @property + def listeners(self): + """ + List of current clients listening for event in this projects + """ + return self._listeners + @asyncio.coroutine def list_files(self): """ diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index 4e79a2f4..e0355ded 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -748,6 +748,9 @@ class QemuVM(BaseVM): Changes the process priority """ + if self._process_priority == "normal": + return + if sys.platform.startswith("win"): try: import win32api @@ -756,7 +759,7 @@ class QemuVM(BaseVM): except ImportError: log.error("pywin32 must be installed to change the priority class for QEMU VM {}".format(self._name)) else: - log.info("setting QEMU VM {} priority class to BELOW_NORMAL".format(self._name)) + log.info("Setting QEMU VM {} priority class to {}".format(self._name, self._process_priority)) handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, 0, self._process.pid) if self._process_priority == "realtime": priority = win32process.REALTIME_PRIORITY_CLASS diff --git a/gns3server/schemas/qemu.py b/gns3server/schemas/qemu.py index 03dc8cd8..43af3409 100644 --- a/gns3server/schemas/qemu.py +++ b/gns3server/schemas/qemu.py @@ -123,7 +123,7 @@ QEMU_CREATE_SCHEMA = { }, "boot_priority": { "description": "QEMU boot priority", - "enum": ["c", "d"] + "enum": ["c", "d", "n", "cn", "cd"] }, "ram": { "description": "amount of RAM in MB", diff --git a/gns3server/templates/layout.html b/gns3server/templates/layout.html index 87eed6f3..54caef09 100644 --- a/gns3server/templates/layout.html +++ b/gns3server/templates/layout.html @@ -16,7 +16,7 @@ | Backup projects | - Status + Status {% block body %}{% endblock %} diff --git a/gns3server/templates/status.html b/gns3server/templates/status.html index 40953637..bed8c797 100644 --- a/gns3server/templates/status.html +++ b/gns3server/templates/status.html @@ -6,11 +6,23 @@ The purpose of this page is to help for GNS3 debug.

Opened projects

-