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 service/rooms/timeline events

Browse source
This commit is contained in:
Charles Hall 2024-07-15 21:04:35 -07:00
parent ee95b6be3c
commit 592e42ba7d
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/service/rooms/timeline.rs
View file

@ -244,7 +244,7 @@ impl Service {
} }
} }
} else { } else {
error!("Invalid unsigned type in pdu."); error!("Invalid unsigned type in pdu");
} }
} }
@ -1251,7 +1251,7 @@ impl Service {
// Request backfill // Request backfill
for backfill_server in admin_servers { for backfill_server in admin_servers {
info!("Asking {backfill_server} for backfill"); info!(server = %backfill_server, "Asking server for backfill");
let response = services() let response = services()
.sending .sending
.send_federation_request( .send_federation_request(
@ -1267,17 +1267,21 @@ impl Service {
Ok(response) => { Ok(response) => {
let pub_key_map = RwLock::new(BTreeMap::new()); let pub_key_map = RwLock::new(BTreeMap::new());
for pdu in response.pdus { for pdu in response.pdus {
if let Err(e) = self if let Err(error) = self
.backfill_pdu(backfill_server, pdu, &pub_key_map) .backfill_pdu(backfill_server, pdu, &pub_key_map)
.await .await
{ {
warn!("Failed to add backfilled pdu: {e}"); warn!(%error, "Failed to add backfilled pdu");
} }
} }
return Ok(()); return Ok(());
} }
Err(e) => { Err(error) => {
warn!("{backfill_server} could not provide backfill: {e}"); warn!(
server = %backfill_server,
%error,
"Server could not provide backfill",
);
} }
} }
} }
@ -1310,7 +1314,7 @@ impl Service {
// Skip the PDU if we already have it as a timeline event // Skip the PDU if we already have it as a timeline event
if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(&event_id)? { if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(&event_id)? {
info!("We already know {event_id} at {pdu_id:?}"); info!(%event_id, ?pdu_id, "We already know this event");
return Ok(()); return Ok(());
} }