NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-06 16:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes check if VPCS process is running.

Browse Source
This commit is contained in:
Jeremy 2015-03-25 14:43:51 -06:00
parent 7d8ff54c78
commit ec6a761e04
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ class VPCSVM(BaseVM):
if isinstance(nio, NIOUDP): if isinstance(nio, NIOUDP):
self.manager.port_manager.release_udp_port(nio.lport, self._project) self.manager.port_manager.release_udp_port(nio.lport, self._project)
if self.is_running():
self._terminate_process() self._terminate_process()
@asyncio.coroutine @asyncio.coroutine
@ -264,7 +265,6 @@ class VPCSVM(BaseVM):
def _terminate_process(self): def _terminate_process(self):
"""Terminate the process if running""" """Terminate the process if running"""
if self._process:
log.info("Stopping VPCS instance {} PID={}".format(self.name, self._process.pid)) log.info("Stopping VPCS instance {} PID={}".format(self.name, self._process.pid))
if sys.platform.startswith("win32"): if sys.platform.startswith("win32"):
self._process.send_signal(signal.CTRL_BREAK_EVENT) self._process.send_signal(signal.CTRL_BREAK_EVENT)
@ -296,7 +296,7 @@ class VPCSVM(BaseVM):
:returns: True or False :returns: True or False
""" """
if self._process: if self._process and self._process.returncode is None:
return True return True
return False return False