arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-05-02 23:38:59 +00:00
Code Issues Releases Wiki Activity

Monitor ubrige processes.

Browse Source
This commit is contained in:
grossmj 2020-03-20 21:30:05 +10:30
parent afbbf7a524
commit aa83fcc7d1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/ubridge/hypervisor.py
View File

@ -28,6 +28,7 @@ import re
from gns3server.utils import parse_version from gns3server.utils import parse_version
from gns3server.utils.asyncio import wait_for_process_termination from gns3server.utils.asyncio import wait_for_process_termination
from gns3server.utils.asyncio import monitor_process
from gns3server.utils.asyncio import subprocess_check_output from gns3server.utils.asyncio import subprocess_check_output
from .ubridge_hypervisor import UBridgeHypervisor from .ubridge_hypervisor import UBridgeHypervisor
from .ubridge_error import UbridgeError from .ubridge_error import UbridgeError
@ -176,6 +177,7 @@ class Hypervisor(UBridgeHypervisor):
env=env) env=env)
log.info("ubridge started PID={}".format(self._process.pid)) log.info("ubridge started PID={}".format(self._process.pid))
monitor_process(self._process, self._termination_callback)
except (OSError, subprocess.SubprocessError) as e: except (OSError, subprocess.SubprocessError) as e:
ubridge_stdout = self.read_stdout() ubridge_stdout = self.read_stdout()
log.error("Could not start ubridge: {}\n{}".format(e, ubridge_stdout)) log.error("Could not start ubridge: {}\n{}".format(e, ubridge_stdout))
@ -188,9 +190,12 @@ class Hypervisor(UBridgeHypervisor):
:param returncode: Process returncode :param returncode: Process returncode
""" """
log.info("uBridge process has stopped, return code: %d", returncode)
if returncode != 0: if returncode != 0:
self._project.emit("log.error", {"message": "uBridge process has stopped, return code: {}\n{}".format(returncode, self.read_stdout())}) error_msg = "uBridge process has stopped, return code: {}\n{}\n".format(returncode, self.read_stdout())
log.error(error_msg)
self._project.emit("log.error", {"message": error_msg})
else:
log.info("uBridge process has stopped, return code: %d", returncode)
async def stop(self): async def stop(self):
""" """