3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: simplify extract_service_info() call 

Don't require the caller to specifiy properties, use the default
property list if not specified.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-01-30 15:02:02 -05:00
parent 2fb136449a
commit 5aa645f974
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
moonraker/components/machine.py
View File

@ -258,7 +258,7 @@ class Machine:
self.system_info['available_services'] = avail_list self.system_info['available_services'] = avail_list
self.system_info['service_state'] = available_svcs self.system_info['service_state'] = available_svcs
svc_info = await self.sys_provider.extract_service_info( svc_info = await self.sys_provider.extract_service_info(
"moonraker", os.getpid(), SERVICE_PROPERTIES "moonraker", os.getpid()
) )
self.moonraker_service_info = svc_info self.moonraker_service_info = svc_info
self.log_service_info(svc_info) self.log_service_info(svc_info)
@ -805,7 +805,11 @@ class BaseProvider:
return self.available_services return self.available_services
async def extract_service_info( async def extract_service_info(
self, service: str, pid: int, properties: List[str], raw: bool = False self,
service: str,
pid: int,
properties: Optional[List[str]] = None,
raw: bool = False
) -> Dict[str, Any]: ) -> Dict[str, Any]:
return {} return {}
@ -911,11 +915,13 @@ class SystemdCliProvider(BaseProvider):
self, self,
service_name: str, service_name: str,
pid: int, pid: int,
properties: List[str], properties: Optional[List[str]] = None,
raw: bool = False raw: bool = False
) -> Dict[str, Any]: ) -> Dict[str, Any]:
service_info: Dict[str, Any] = {} service_info: Dict[str, Any] = {}
expected_name = f"{service_name}.service" expected_name = f"{service_name}.service"
if properties is None:
properties = SERVICE_PROPERTIES
try: try:
resp: str = await self.shell_cmd.exec_cmd( resp: str = await self.shell_cmd.exec_cmd(
f"systemctl status {pid}" f"systemctl status {pid}"
@ -1153,7 +1159,7 @@ class SystemdDbusProvider(BaseProvider):
self, self,
service_name: str, service_name: str,
pid: int, pid: int,
properties: List[str], properties: Optional[List[str]] = None,
raw: bool = False raw: bool = False
) -> Dict[str, Any]: ) -> Dict[str, Any]:
if not hasattr(self, "systemd_mgr"): if not hasattr(self, "systemd_mgr"):
@ -1161,6 +1167,8 @@ class SystemdDbusProvider(BaseProvider):
mgr = self.systemd_mgr mgr = self.systemd_mgr
service_info: Dict[str, Any] = {} service_info: Dict[str, Any] = {}
expected_name = f"{service_name}.service" expected_name = f"{service_name}.service"
if properties is None:
properties = SERVICE_PROPERTIES
try: try:
dbus_path: str dbus_path: str
dbus_path = await mgr.call_get_unit_by_pid(pid) # type: ignore dbus_path = await mgr.call_get_unit_by_pid(pid) # type: ignore
@ -1344,7 +1352,7 @@ class SupervisordProvider(BaseProvider):
self, self,
service: str, service: str,
pid: int, pid: int,
properties: List[str], properties: Optional[List[str]] = None,
raw: bool = False raw: bool = False
) -> Dict[str, Any]: ) -> Dict[str, Any]:
return {} return {}

3
moonraker/klippy_connection.py
View File

@ -257,9 +257,8 @@ class KlippyConnection:
if self._get_peer_credentials(writer): if self._get_peer_credentials(writer):
machine: Machine = self.server.lookup_component("machine") machine: Machine = self.server.lookup_component("machine")
provider = machine.get_system_provider() provider = machine.get_system_provider()
props = ["Description", "ExecStart", "FragmentPath"]
svc_info = await provider.extract_service_info( svc_info = await provider.extract_service_info(
"klipper", self._peer_cred["process_id"], props "klipper", self._peer_cred["process_id"]
) )
if svc_info != self._service_info: if svc_info != self._service_info:
self._service_info = svc_info self._service_info = svc_info