From 266c5b53d1380cfc4bda18c8c80d909891caa9d3 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Mon, 29 Aug 2022 13:42:53 -0400 Subject: [PATCH] machine: extend system info request with unit names Report the unit names for both Moonarker and Klipper. Signed-off-by: Eric Callahan --- moonraker/components/machine.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/moonraker/components/machine.py b/moonraker/components/machine.py index 53e62bc..6868272 100644 --- a/moonraker/components/machine.py +++ b/moonraker/components/machine.py @@ -41,6 +41,7 @@ if TYPE_CHECKING: from confighelper import ConfigHelper from websockets import WebRequest from app import MoonrakerApp + from klippy_connection import KlippyConnection from .shell_command import ShellCommandFactory as SCMDComp from .database import MoonrakerDatabase from .file_manager.file_manager import FileManager @@ -269,7 +270,14 @@ class Machine: async def _handle_sysinfo_request(self, web_request: WebRequest ) -> Dict[str, Any]: - return {"system_info": self.system_info} + kconn: KlippyConnection + kconn = self.server.lookup_component("klippy_connection") + sys_info = self.system_info.copy() + sys_info["instance_ids"] = { + "moonraker": self.unit_name, + "klipper": kconn.unit_name + } + return {"system_info": sys_info} async def _set_sudo_password( self, web_request: WebRequest