Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 4 deletions rust/agama-server/src/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ mod ws;
use agama_lib::{connection, error::ServiceError, http::Event};
use common::{IssuesService, ProgressService};
pub use config::ServiceConfig;
use event::log_event;
pub use event::{EventsReceiver, EventsSender};
pub use service::MainServiceBuilder;
use std::path::Path;
Expand Down Expand Up @@ -189,10 +190,7 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
tokio::pin!(stream);
let e = events.clone();
while let Some((_, event)) = stream.next().await {
match serde_json::to_string(&event) {
Ok(json) => tracing::info!("event: {json}"),
Err(_) => tracing::info!("event (not serialized): {:?}", &event),
}
log_event(&event);
_ = e.send(event);
}
Ok(())
Expand Down
3 changes: 2 additions & 1 deletion rust/agama-server/src/web/common/progress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
//!
//! At this point, it only handles the progress that are exposed through D-Bus.

use crate::web::EventsSender;
use crate::web::{event::log_event, EventsSender};
use agama_lib::{
http::Event,
progress::{Progress, ProgressSequence},
Expand Down Expand Up @@ -174,6 +174,7 @@ impl ProgressService {
path: path.to_string(),
progress,
};
log_event(&event);
self.events.send(event)?;
Ok(())
}
Expand Down
8 changes: 8 additions & 0 deletions rust/agama-server/src/web/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,11 @@ use tokio::sync::broadcast::{Receiver, Sender};

pub type EventsSender = Sender<Event>;
pub type EventsReceiver = Receiver<Event>;

pub fn log_event(event: &Event) {
tracing::info!("event(debug): {:?}", &event);
match serde_json::to_string(&event) {
Ok(json) => tracing::info!("event: {json}"),
Err(_) => tracing::info!("event (not serialized): {:?}", &event),
}
}
5 changes: 5 additions & 0 deletions rust/package/agama.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 22 10:47:36 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

- Log ProgressChanged events (gh#agama-project/agama#2597).

-------------------------------------------------------------------
Tue Jul 22 07:53:34 UTC 2025 - Martin Vidner <mvidner@suse.com>

Expand Down