Do not crash if l10n cannot connect to D-Bus

Author: imobachgs

rust/agama-l10n/src/start.rs

@@ -31,8 +31,6 @@ use agama_utils::{
 pub enum Error {
     #[error(transparent)]
     Service(#[from] service::Error),
-    #[error(transparent)]
-    Monitor(#[from] monitor::Error),
 }
 
 /// Starts the localization service.
@@ -53,8 +51,17 @@ pub async fn start(
     let model = Model::from_system()?;
     let service = Service::new(model, issues, events);
     let handler = actor::spawn(service);
-    let monitor = Monitor::new(handler.clone()).await?;
-    monitor::spawn(monitor);
+
+    match Monitor::new(handler.clone()).await {
+        Ok(monitor) => monitor::spawn(monitor),
+        Err(error) => {
+            tracing::error!(
+                "Could not launch the l10n monitor, therefore changes from systemd will be ignored. \
+                 The original error was {error}"
+            );
+        }
+    }
+
     Ok(handler)
 }
 

rust/agama-server/src/server/web.rs

@@ -31,7 +31,6 @@ use agama_utils::{
     },
     question,
 };
-use anyhow;
 use axum::{
     extract::State,
     response::{IntoResponse, Response},
@@ -72,17 +71,17 @@ type ServerResult<T> = Result<T, Error>;
 ///
 /// * `events`: channel to send events to the websocket.
 /// * `dbus`: connection to Agama's D-Bus server. If it is not given, those features
-///           that require to connect to the Agama's D-Bus server won't work.
+///   that require to connect to the Agama's D-Bus server won't work.
 pub async fn server_service(
     events: event::Sender,
     dbus: Option<zbus::Connection>,
 ) -> Result<Router, ServiceError> {
     let questions = question::start(events.clone())
         .await
-        .map_err(|e| anyhow::Error::new(e))?;
+        .map_err(anyhow::Error::msg)?;
     let manager = manager::start(questions.clone(), events, dbus)
         .await
-        .map_err(|e| anyhow::Error::new(e))?;
+        .map_err(anyhow::Error::msg)?;
 
     let state = ServerState { manager, questions };