rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvement: better logging

Browse Source 
Use CONDUIT_LOG or the log setting in the config
This commit is contained in:
Timo Kösters
2021-03-23 22:01:14 +01:00
parent 46d8f36a2c
commit 1d00a8c41f
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server_server.rs
View File

@@ -1339,11 +1339,14 @@ pub(crate) async fn build_forward_extremity_snapshots(
// The current server state and incoming event state are built to be
// the state after.
// This would be the incoming state from the server.
Some(leave_pdu) => {
Some(leaf_pdu) => {
let pdu_shortstatehash = db
.rooms
.pdu_shortstatehash(&leave_pdu.event_id)?
.ok_or_else(|| Error::bad_database("Found pdu with no statehash in db."))?;
.pdu_shortstatehash(&leaf_pdu.event_id)?
.ok_or_else(|| {
warn!("Leaf pdu: {:?}", leaf_pdu);
Error::bad_database("Found pdu with no statehash in db.")
})?;
if current_shortstatehash.as_ref() == Some(&pdu_shortstatehash) {
includes_current_state = true;
@@ -1357,8 +1360,8 @@ pub(crate) async fn build_forward_extremity_snapshots(
.collect::<StateMap<_>>();
// Now it's the state after
let key = (leave_pdu.kind.clone(), leave_pdu.state_key.clone());
state_before.insert(key, Arc::new(leave_pdu));
let key = (leaf_pdu.kind.clone(), leaf_pdu.state_key.clone());
state_before.insert(key, Arc::new(leaf_pdu));
fork_states.insert(state_before);
}