From b661e0cf3f27f59ec91670e1e45aaf5aa2191e9b Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Fri, 31 Mar 2023 10:49:24 +0200 Subject: [PATCH] rustjail: Add anyhow context for D-Bus connections In cases where the D-Bus connection fails, add a little additional context about the origin of the error. Fixes: 6561 Signed-off-by: Christophe de Dinechin Suggested-by: Archana Shinde Spell-checked-by: Greg Kurz --- src/agent/rustjail/src/cgroups/systemd/dbus_client.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/agent/rustjail/src/cgroups/systemd/dbus_client.rs b/src/agent/rustjail/src/cgroups/systemd/dbus_client.rs index fd3b9bf8f..0ff606930 100644 --- a/src/agent/rustjail/src/cgroups/systemd/dbus_client.rs +++ b/src/agent/rustjail/src/cgroups/systemd/dbus_client.rs @@ -36,8 +36,9 @@ pub struct DBusClient {} impl DBusClient { fn build_proxy(&self) -> Result> { - let connection = zbus::blocking::Connection::system()?; - let proxy = SystemManager::new(&connection)?; + let connection = + zbus::blocking::Connection::system().context("Establishing a D-Bus connection")?; + let proxy = SystemManager::new(&connection).context("Building a D-Bus proxy manager")?; Ok(proxy) } } @@ -109,7 +110,9 @@ impl SystemdInterface for DBusClient { } fn unit_exists(&self, unit_name: &str) -> Result { - let proxy = self.build_proxy()?; + let proxy = self + .build_proxy() + .with_context(|| format!("Checking if systemd unit {} exists", unit_name))?; Ok(proxy.get_unit(unit_name).is_ok()) }