From 95ed31391dcc17b576508b3031295f974e510ab5 Mon Sep 17 00:00:00 2001
From: Simon Laux <Simon-Laux@users.noreply.github.com>
Date: Tue, 9 Dec 2025 13:17:31 +0100
Subject: [PATCH] fix: use logging macros instead of emitting event directly,
 so that it is also logged by tracing (#7459)

The events are needed when you are not using chatmail core from rust, if
you use chatmail core from your rust bot or from tauri, then you likely
already use the rust logging/tracing ecosystem. So it makes sense to use
it instead of listening to the events and logging them yourself.

This pr fixes a few cases where the event was direclty emitted instead
of using the macro and thus was not also automatically logged via
tracing.
---
 src/accounts.rs               | 15 +++++++++++++++
 src/events/chatlist_events.rs |  5 +++--
 src/log/stream.rs             |  5 +++++
 src/qr.rs                     |  6 +++---
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/accounts.rs b/src/accounts.rs
index 041d9735f..a0f93bdf8 100644
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -377,6 +377,11 @@ impl Accounts {
                 "Starting background fetch for {n_accounts} accounts."
             )),
         });
+        ::tracing::event!(
+            ::tracing::Level::INFO,
+            account_id = 0,
+            "Starting background fetch for {n_accounts} accounts."
+        );
         let mut set = JoinSet::new();
         for account in accounts {
             set.spawn(async move {
@@ -392,6 +397,11 @@ impl Accounts {
                 "Finished background fetch for {n_accounts} accounts."
             )),
         });
+        ::tracing::event!(
+            ::tracing::Level::INFO,
+            account_id = 0,
+            "Finished background fetch for {n_accounts} accounts."
+        );
     }
 
     /// Auxiliary function for [Accounts::background_fetch].
@@ -429,6 +439,11 @@ impl Accounts {
                 id: 0,
                 typ: EventType::Warning("Background fetch timed out.".to_string()),
             });
+            ::tracing::event!(
+                ::tracing::Level::WARN,
+                account_id = 0,
+                "Background fetch timed out."
+            );
         }
         events.emit(Event {
             id: 0,
diff --git a/src/events/chatlist_events.rs b/src/events/chatlist_events.rs
index 93ea7b680..50ee06828 100644
--- a/src/events/chatlist_events.rs
+++ b/src/events/chatlist_events.rs
@@ -30,9 +30,10 @@ pub(crate) async fn emit_chatlist_item_changed_for_contact_chat(
     match ChatId::lookup_by_contact(context, contact_id).await {
         Ok(Some(chat_id)) => self::emit_chatlist_item_changed(context, chat_id),
         Ok(None) => {}
-        Err(error) => context.emit_event(EventType::Error(format!(
+        Err(error) => error!(
+            context,
             "failed to find chat id for contact for chatlist event: {error:?}"
-        ))),
+        ),
     }
 }
 
diff --git a/src/log/stream.rs b/src/log/stream.rs
index 9ced49445..dc91407b8 100644
--- a/src/log/stream.rs
+++ b/src/log/stream.rs
@@ -92,6 +92,11 @@ impl<S: SessionStream> AsyncRead for LoggingStream<S> {
                 "Read error on stream {peer_addr:?} after reading {} and writing {} bytes: {err}.",
                 this.metrics.total_read, this.metrics.total_written
             );
+            tracing::event!(
+                ::tracing::Level::WARN,
+                account_id = *this.account_id,
+                log_message
+            );
             this.events.emit(Event {
                 id: *this.account_id,
                 typ: EventType::Warning(log_message),
diff --git a/src/qr.rs b/src/qr.rs
index b33077dac..151b49672 100644
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -16,7 +16,6 @@ use serde::Deserialize;
 use crate::config::Config;
 use crate::contact::{Contact, ContactId, Origin};
 use crate::context::Context;
-use crate::events::EventType;
 use crate::key::Fingerprint;
 use crate::login_param::{EnteredCertificateChecks, EnteredLoginParam, EnteredServerLoginParam};
 use crate::net::http::post_empty;
@@ -824,9 +823,10 @@ pub(crate) async fn login_param_from_account_qr(
         match serde_json::from_str::<CreateAccountErrorResponse>(&response_text) {
             Ok(error) => Err(anyhow!(error.reason)),
             Err(parse_error) => {
-                context.emit_event(EventType::Error(format!(
+                error!(
+                    context,
                     "Cannot create account, server response could not be parsed:\n{parse_error:#}\nraw response:\n{response_text}"
-                )));
+                );
                 bail!("Cannot create account, unexpected server response:\n{response_text:?}")
             }
         }