From 6fc7d014c341b459da74f5f5e566ab1f278b1c05 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 29 Apr 2015 15:10:42 -0600 Subject: [PATCH] Some wording changes. --- gns3server/modules/dynamips/nodes/router.py | 4 +++- gns3server/modules/iou/iou_vm.py | 5 +++-- gns3server/modules/project.py | 9 +++++---- gns3server/modules/qemu/qemu_vm.py | 5 +++-- gns3server/modules/vpcs/vpcs_vm.py | 5 +++-- gns3server/utils/asyncio.py | 3 +-- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gns3server/modules/dynamips/nodes/router.py b/gns3server/modules/dynamips/nodes/router.py index a994d910..5f1e50ad 100644 --- a/gns3server/modules/dynamips/nodes/router.py +++ b/gns3server/modules/dynamips/nodes/router.py @@ -267,10 +267,12 @@ class Router(BaseVM): @asyncio.coroutine def _termination_callback(self, returncode): """ - Called when the process is killed + Called when the process has stopped. :param returncode: Process returncode """ + + log.info("Dynamips hypervisor process has stopped, return code: %d", returncode) self.status = "stopped" @asyncio.coroutine diff --git a/gns3server/modules/iou/iou_vm.py b/gns3server/modules/iou/iou_vm.py index 2ef81e2b..0aaaffc3 100644 --- a/gns3server/modules/iou/iou_vm.py +++ b/gns3server/modules/iou/iou_vm.py @@ -483,11 +483,12 @@ class IOUVM(BaseVM): def _termination_callback(self, returncode): """ - Called when the process is killed + Called when the process has stopped. :param returncode: Process returncode """ - log.info("IOU process crash return code: %d", returncode) + + log.info("IOU process has stopped, return code: %d", returncode) self._terminate_process_iou() self._terminate_process_iouyap() self._ioucon_thread_stop_event.set() diff --git a/gns3server/modules/project.py b/gns3server/modules/project.py index 39756c9d..b2791535 100644 --- a/gns3server/modules/project.py +++ b/gns3server/modules/project.py @@ -65,7 +65,7 @@ class Project: self._used_tcp_ports = set() self._used_udp_ports = set() - # List of clients listen for notifications + # List of clients listening for notifications self._listeners = set() if path is None: @@ -409,11 +409,12 @@ class Project: def emit(self, action, event): """ - Send an event to all the client listens for notifications + Send an event to all the client listening for notifications - :param action: Action happened - :param event: Event sended to the client + :param action: Action name + :param event: Event to send """ + for listener in self._listeners: listener.put_nowait((action, event, )) diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index 73b008b9..6719102b 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -620,12 +620,13 @@ class QemuVM(BaseVM): def _termination_callback(self, returncode): """ - Called when the process is killed + Called when the process has stopped. :param returncode: Process returncode """ + if self.started: - log.info("Process Qemu is dead. Return code: %d", returncode) + log.info("QEMU process has stopped, return code: %d", returncode) self.status = "stopped" self._process = None diff --git a/gns3server/modules/vpcs/vpcs_vm.py b/gns3server/modules/vpcs/vpcs_vm.py index aadc60c1..e8e53c12 100644 --- a/gns3server/modules/vpcs/vpcs_vm.py +++ b/gns3server/modules/vpcs/vpcs_vm.py @@ -240,12 +240,13 @@ class VPCSVM(BaseVM): def _termination_callback(self, returncode): """ - Called when the process is killed + Called when the process has stopped. :param returncode: Process returncode """ + if self._started: - log.info("Process VPCS is dead. Return code: %d", returncode) + log.info("VPCS process has stopped, return code: %d", returncode) self._started = False self.status = "stopped" self._process = None diff --git a/gns3server/utils/asyncio.py b/gns3server/utils/asyncio.py index 7c9cc606..39e1ac8e 100644 --- a/gns3server/utils/asyncio.py +++ b/gns3server/utils/asyncio.py @@ -17,7 +17,6 @@ import asyncio -import shutil import sys @@ -91,6 +90,6 @@ def _check_process(process, termination_callback): def monitor_process(process, termination_callback): - """Call termination_callback when process die""" + """Call termination_callback when a process dies""" asyncio.async(_check_process(process, termination_callback))