mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move the guts of updateLatestEvents to a separate function to keep the commit and rollback code clearer

Browse source
This commit is contained in:
Mark Haines 2017-02-21 14:37:10 +00:00
parent 8a9dbad5a8
commit 9079f961f7
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
View file

@ -26,7 +26,7 @@ func updateLatestEvents(
) (err error) { ) (err error) {
oldLatest, updater, err := db.GetLatestEventsForUpdate(roomNID) oldLatest, updater, err := db.GetLatestEventsForUpdate(roomNID)
if err != nil { if err != nil {
return err return
} }
defer func() { defer func() {
if err == nil { if err == nil {
@ -42,6 +42,14 @@ func updateLatestEvents(
} }
}() }()
err = doUpdateLatestEvents(updater, oldLatest, roomNID, stateAtEvent, event)
return
}
func doUpdateLatestEvents(
updater types.RoomRecentEventsUpdater, oldLatest []types.StateAtEventAndReference, roomNID types.RoomNID, stateAtEvent types.StateAtEvent, event gomatrixserverlib.Event,
) error {
var err error
var prevEvents []gomatrixserverlib.EventReference var prevEvents []gomatrixserverlib.EventReference
prevEvents = event.PrevEvents() prevEvents = event.PrevEvents()
@ -84,7 +92,5 @@ func updateLatestEvents(
return err return err
} }
// The err should be nil at this point. return nil
// But when we call Close in the defer above it might set an error here.
return
} }