From 4efb6575b76ba3c316228115675946f2bf95a978 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Sun, 14 Aug 2022 07:28:17 -0400 Subject: [PATCH] machine: report provider type and container info Signed-off-by: Eric Callahan --- moonraker/components/machine.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/moonraker/components/machine.py b/moonraker/components/machine.py index 63d8a21..c9ff1bc 100644 --- a/moonraker/components/machine.py +++ b/moonraker/components/machine.py @@ -89,12 +89,12 @@ class Machine: "systemd_cli": SystemdCliProvider, "systemd_dbus": SystemdDbusProvider } - ptype = config.get('provider', 'systemd_dbus') - pclass = providers.get(ptype) + self.provider_type = config.get('provider', 'systemd_dbus') + pclass = providers.get(self.provider_type) if pclass is None: - raise config.error(f"Invalid Provider: {ptype}") + raise config.error(f"Invalid Provider: {self.provider_type}") self.sys_provider: BaseProvider = pclass(config) - logging.info(f"Using System Provider: {ptype}") + logging.info(f"Using System Provider: {self.provider_type}") self.server.register_endpoint( "/machine/reboot", ['POST'], self._handle_machine_request) @@ -148,6 +148,12 @@ class Machine: def get_system_provider(self): return self.sys_provider + def is_inside_container(self): + return self.inside_container + + def get_provider_type(self): + return self.provider_type + def get_moonraker_service_info(self): return dict(self.moonraker_service_info)