1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-22 19:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak logging for detected state resets

Browse Source
This commit is contained in:
Neil Alexander 2022-09-05 17:08:54 +01:00
parent bea3dbe77b
commit ecee5f10f4
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roomserver/internal/input/input_latest_events.go
View File

@ -275,7 +275,7 @@ func (u *latestEventsUpdater) latestState() error {
return fmt.Errorf("roomState.DifferenceBetweenStateSnapshots: %w", err) return fmt.Errorf("roomState.DifferenceBetweenStateSnapshots: %w", err)
} }
if removed := len(u.removed) - len(u.added); removed > 0 { if removed := len(u.removed) - len(u.added); !u.rewritesState && removed > 0 {
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"event_id": u.event.EventID(), "event_id": u.event.EventID(),
"room_id": u.event.RoomID(), "room_id": u.event.RoomID(),
@ -283,7 +283,7 @@ func (u *latestEventsUpdater) latestState() error {
"new_state_nid": u.newStateNID, "new_state_nid": u.newStateNID,
"old_latest": u.oldLatest.EventIDs(), "old_latest": u.oldLatest.EventIDs(),
"new_latest": u.latest.EventIDs(), "new_latest": u.latest.EventIDs(),
}).Errorf("Unexpected state deletion (removing %d events)", removed) }).Warnf("State reset detected (removing %d events)", removed)
} }
// Also work out the state before the event removes and the event // Also work out the state before the event removes and the event