magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'redactfix' into 'next'

Browse source 
Redaction fix

Closes #235

See merge request famedly/conduit!298
This commit is contained in:
Timo Kösters 2022-02-18 12:00:40 +00:00
commit b8eaa3be85
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server_server.rs
View file

@ -1571,7 +1571,10 @@ async fn upgrade_outlier_to_timeline_pdu(
soft_fail,
&state_lock,
)
.map_err(|_| "Failed to add pdu to db.".to_owned())?;
.map_err(|e| {
warn!("Failed to add pdu to db: {}", e);
"Failed to add pdu to db.".to_owned()
})?;
// Soft fail, we keep the event as an outlier but don't add it to the timeline
warn!("Event was soft failed: {:?}", incoming_pdu);
@ -1737,7 +1740,10 @@ async fn upgrade_outlier_to_timeline_pdu(
soft_fail,
&state_lock,
)
.map_err(|_| "Failed to add pdu to db.".to_owned())?;
.map_err(|e| {
warn!("Failed to add pdu to db: {}", e);
"Failed to add pdu to db.".to_owned()
})?;
debug!("Appended incoming pdu.");