From 06f39696d30541aa5a291fbd15dfa93dfc8112f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 16 Aug 2022 15:51:19 +0200
Subject: [PATCH] chore(crypto): Improve some logs in the Olm message handling
 code

---
 crates/matrix-sdk-crypto/src/olm/account.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/matrix-sdk-crypto/src/olm/account.rs b/crates/matrix-sdk-crypto/src/olm/account.rs
index 480f6bcba..fa6a174f9 100644
--- a/crates/matrix-sdk-crypto/src/olm/account.rs
+++ b/crates/matrix-sdk-crypto/src/olm/account.rs
@@ -308,8 +308,8 @@ impl Account {
                     // return with an error if it isn't one.
                     OlmMessage::Normal(_) => {
                         warn!(
-                            sender = sender.as_str(),
-                            sender_key = sender_key.to_base64(),
+                            %sender,
+                            %sender_key,
                             "Failed to decrypt a non-pre-key message with all \
                             available sessions",
                         );
@@ -323,11 +323,11 @@ impl Account {
                             Ok(r) => r,
                             Err(e) => {
                                 warn!(
-                                    sender = sender.as_str(),
-                                    sender_key = sender_key.to_base64(),
-                                    error = ?e,
+                                    %sender,
+                                    %sender_key,
+                                    session_keys = ?m.session_keys(),
                                     "Failed to create a new Olm session from a \
-                                    prekey message",
+                                    pre-key message: {e:?}",
                                 );
                                 return Err(OlmError::SessionWedged(sender.to_owned(), sender_key));
                             }
@@ -350,8 +350,8 @@ impl Account {
             };
 
         trace!(
-            sender = sender.as_str(),
-            sender_key = sender_key.to_base64(),
+            %sender,
+            %sender_key,
             "Successfully decrypted an Olm message"
         );