backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tracing in fetch_signing_keys()

Browse source
This commit is contained in:
Lambda 2024-06-02 17:27:11 +00:00 • committed by Charles Hall
parent 7dbae9ac2b
commit 60d32ddf48
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/service/rooms/event_handler.rs
View file

@ -42,7 +42,10 @@ use tokio::sync::{RwLock, RwLockWriteGuard, Semaphore};
use tracing::{debug, error, info, trace, warn}; use tracing::{debug, error, info, trace, warn};
use super::state_compressor::CompressedStateEvent; use super::state_compressor::CompressedStateEvent;
use crate::{service::pdu, services, Error, PduEvent, Result}; use crate::{
service::pdu, services, utils::debug_slice_truncated, Error, PduEvent,
Result,
};
pub(crate) struct Service; pub(crate) struct Service;
@ -1841,7 +1844,10 @@ impl Service {
/// Search the DB for the signing keys of the given server, if we don't have /// Search the DB for the signing keys of the given server, if we don't have
/// them fetch them from the server and save to our DB. /// them fetch them from the server and save to our DB.
#[tracing::instrument(skip_all)] #[tracing::instrument(
skip(self, signature_ids),
fields(signature_ids = debug_slice_truncated(&signature_ids, 3))
)]
pub(crate) async fn fetch_signing_keys( pub(crate) async fn fetch_signing_keys(
&self, &self,
origin: &ServerName, origin: &ServerName,
@ -1913,7 +1919,7 @@ impl Service {
} }
} }
trace!("Loading signing keys for {}", origin); trace!("Loading signing keys from database");
let mut result: BTreeMap<_, _> = services() let mut result: BTreeMap<_, _> = services()
.globals .globals
@ -1926,7 +1932,7 @@ impl Service {
return Ok(result); return Ok(result);
} }
debug!("Fetching signing keys for {} over federation", origin); debug!("Fetching signing keys over federation");
if let Some(server_key) = services() if let Some(server_key) = services()
.sending .sending
@ -1959,7 +1965,7 @@ impl Service {
} }
for server in services().globals.trusted_servers() { for server in services().globals.trusted_servers() {
debug!("Asking {} for {}'s signing key", server, origin); debug!(trusted_server = %server, "Asking trusted server for signing keys");
if let Some(server_keys) = services() if let Some(server_keys) = services()
.sending .sending
.send_federation_request( .send_federation_request(
@ -1983,7 +1989,7 @@ impl Service {
.collect::<Vec<_>>() .collect::<Vec<_>>()
}) })
{ {
trace!("Got signing keys: {:?}", server_keys); trace!(?server_keys, "Got signing keys from trusted server");
for k in server_keys { for k in server_keys {
services().globals.add_signing_key(origin, k.clone())?; services().globals.add_signing_key(origin, k.clone())?;
result.extend( result.extend(
@ -2008,7 +2014,7 @@ impl Service {
back_off(signature_ids).await; back_off(signature_ids).await;
warn!("Failed to find public key for server: {}", origin); warn!("Failed to find all public keys");
Err(Error::BadServerResponse("Failed to find public key for server")) Err(Error::BadServerResponse("Failed to find public key for server"))
} }