From 5aa645f9749d1883858f65171b1d600ca0997bd6 Mon Sep 17 00:00:00 2001
From: Eric Callahan <arksine.code@gmail.com>
Date: Mon, 30 Jan 2023 15:02:02 -0500
Subject: [PATCH] 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>
---
 moonraker/components/machine.py | 18 +++++++++++++-----
 moonraker/klippy_connection.py  |  3 +--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/moonraker/components/machine.py b/moonraker/components/machine.py
index 78e93f5..2c86e9c 100644
--- a/moonraker/components/machine.py
+++ b/moonraker/components/machine.py
@@ -258,7 +258,7 @@ class Machine:
         self.system_info['available_services'] = avail_list
         self.system_info['service_state'] = available_svcs
         svc_info = await self.sys_provider.extract_service_info(
-            "moonraker", os.getpid(), SERVICE_PROPERTIES
+            "moonraker", os.getpid()
         )
         self.moonraker_service_info = svc_info
         self.log_service_info(svc_info)
@@ -805,7 +805,11 @@ class BaseProvider:
         return self.available_services
 
     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]:
         return {}
 
@@ -911,11 +915,13 @@ class SystemdCliProvider(BaseProvider):
         self,
         service_name: str,
         pid: int,
-        properties: List[str],
+        properties: Optional[List[str]] = None,
         raw: bool = False
     ) -> Dict[str, Any]:
         service_info: Dict[str, Any] = {}
         expected_name = f"{service_name}.service"
+        if properties is None:
+            properties = SERVICE_PROPERTIES
         try:
             resp: str = await self.shell_cmd.exec_cmd(
                 f"systemctl status {pid}"
@@ -1153,7 +1159,7 @@ class SystemdDbusProvider(BaseProvider):
         self,
         service_name: str,
         pid: int,
-        properties: List[str],
+        properties: Optional[List[str]] = None,
         raw: bool = False
     ) -> Dict[str, Any]:
         if not hasattr(self, "systemd_mgr"):
@@ -1161,6 +1167,8 @@ class SystemdDbusProvider(BaseProvider):
         mgr = self.systemd_mgr
         service_info: Dict[str, Any] = {}
         expected_name = f"{service_name}.service"
+        if properties is None:
+            properties = SERVICE_PROPERTIES
         try:
             dbus_path: str
             dbus_path = await mgr.call_get_unit_by_pid(pid)  # type: ignore
@@ -1344,7 +1352,7 @@ class SupervisordProvider(BaseProvider):
         self,
         service: str,
         pid: int,
-        properties: List[str],
+        properties: Optional[List[str]] = None,
         raw: bool = False
     ) -> Dict[str, Any]:
         return {}
diff --git a/moonraker/klippy_connection.py b/moonraker/klippy_connection.py
index aad83f3..537f76f 100644
--- a/moonraker/klippy_connection.py
+++ b/moonraker/klippy_connection.py
@@ -257,9 +257,8 @@ class KlippyConnection:
                 if self._get_peer_credentials(writer):
                     machine: Machine = self.server.lookup_component("machine")
                     provider = machine.get_system_provider()
-                    props = ["Description", "ExecStart", "FragmentPath"]
                     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:
                         self._service_info = svc_info