mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 21:52:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

logging: Extract debug log code into a separate function.

Browse Source 
This reduces the work we do to calculate changed devices etc. when DEBUG
logging is not enabled, but more importantly (to me) it makes clear
that this code is only used for logging.
This commit is contained in:
Andy Balaam
2024-07-16 13:30:10 +01:00
committed by Andy Balaam
parent 8845550e72
commit 942b2f937c
1 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
crates/matrix-sdk-crypto/src/identities/manager.rs
View File

@@ -27,7 +27,7 @@ use ruma::{
OwnedServerName, OwnedTransactionId, OwnedUserId, ServerName, TransactionId, UserId,
};
use tokio::sync::Mutex;
use tracing::{debug, info, instrument, trace, warn};
use tracing::{debug, enabled, info, instrument, trace, warn, Level};
use crate::{
error::OlmResult,
@@ -182,37 +182,9 @@ impl IdentityManager {
.await?;
}
#[allow(unknown_lints, clippy::unwrap_or_default)] // false positive
let changed_devices = devices.changed.iter().fold(BTreeMap::new(), |mut acc, d| {
acc.entry(d.user_id()).or_insert_with(BTreeSet::new).insert(d.device_id());
acc
});
#[allow(unknown_lints, clippy::unwrap_or_default)] // false positive
let new_devices = devices.new.iter().fold(BTreeMap::new(), |mut acc, d| {
acc.entry(d.user_id()).or_insert_with(BTreeSet::new).insert(d.device_id());
acc
});
#[allow(unknown_lints, clippy::unwrap_or_default)] // false positive
let deleted_devices = devices.deleted.iter().fold(BTreeMap::new(), |mut acc, d| {
acc.entry(d.user_id()).or_insert_with(BTreeSet::new).insert(d.device_id());
acc
});
let new_identities = identities.new.iter().map(|i| i.user_id()).collect::<BTreeSet<_>>();
let changed_identities =
identities.changed.iter().map(|i| i.user_id()).collect::<BTreeSet<_>>();
debug!(
?request_id,
?new_devices,
?changed_devices,
?deleted_devices,
?new_identities,
?changed_identities,
"Finished handling of the `/keys/query` response"
);
if enabled!(Level::DEBUG) {
debug_log_keys_query_response(&devices, &identities, request_id);
}
Ok((devices, identities))
}
@@ -1011,6 +983,46 @@ impl IdentityManager {
}
}
/// Log information about what changed after processing a /keys/query response.
/// Only does anything if the DEBUG log level is enabled.
fn debug_log_keys_query_response(
devices: &DeviceChanges,
identities: &IdentityChanges,
request_id: &TransactionId,
) {
#[allow(unknown_lints, clippy::unwrap_or_default)] // false positive
let changed_devices = devices.changed.iter().fold(BTreeMap::new(), |mut acc, d| {
acc.entry(d.user_id()).or_insert_with(BTreeSet::new).insert(d.device_id());
acc
});
#[allow(unknown_lints, clippy::unwrap_or_default)] // false positive
let new_devices = devices.new.iter().fold(BTreeMap::new(), |mut acc, d| {
acc.entry(d.user_id()).or_insert_with(BTreeSet::new).insert(d.device_id());
acc
});
#[allow(unknown_lints, clippy::unwrap_or_default)] // false positive
let deleted_devices = devices.deleted.iter().fold(BTreeMap::new(), |mut acc, d| {
acc.entry(d.user_id()).or_insert_with(BTreeSet::new).insert(d.device_id());
acc
});
let new_identities = identities.new.iter().map(|i| i.user_id()).collect::<BTreeSet<_>>();
let changed_identities =
identities.changed.iter().map(|i| i.user_id()).collect::<BTreeSet<_>>();
debug!(
?request_id,
?new_devices,
?changed_devices,
?deleted_devices,
?new_identities,
?changed_identities,
"Finished handling of the `/keys/query` response"
);
}
#[cfg(any(test, feature = "testing"))]
#[allow(dead_code)]
pub(crate) mod testing {