Skip to content

Improve the reporting of D-Bus connection error #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imobachgs merged 1 commit into from
Jul 13, 2023
Merged

Improve the reporting of D-Bus connection error #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions rust/agama-lib/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ use zbus;

#[derive(Error, Debug)]
pub enum ServiceError {
#[error("D-Bus service error: {0}")]
#[error("D-Bus service error")]
DBus(#[from] zbus::Error),
#[error("Could not connect to Agama bus at '{0}'")]
DBusConnectionError(String, #[source] zbus::Error),
#[error("Unknown product '{0}'. Available products: '{1:?}'")]
UnknownProduct(String, Vec<String>),
// it's fine to say only "Error" because the original
Expand All @@ -24,7 +26,7 @@ pub enum ProfileError {
Unreachable(#[from] curl::Error),
#[error("Jsonnet evaluation failed:\n{0}")]
EvaluationError(String),
#[error("I/O error: '{0}'")]
#[error("I/O error")]
InputOutputError(#[from] io::Error),
#[error("The profile is not a valid JSON file")]
FormatError(#[from] serde_json::Error),
Expand Down
3 changes: 1 addition & 2 deletions rust/agama-lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ mod store;
pub use store::Store;

use crate::error::ServiceError;
use anyhow::Context;

const ADDRESS: &str = "unix:path=/run/agama/bus";

Expand All @@ -52,6 +51,6 @@ pub async fn connection_to(address: &str) -> Result<zbus::Connection, ServiceErr
let connection = zbus::ConnectionBuilder::address(address)?
.build()
.await
.context(format!("Connecting to Agama bus at {ADDRESS}"))?;
.map_err(|e| ServiceError::DBusConnectionError(ADDRESS.to_string(), e))?;
Ok(connection)
}