mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into neilalexander/userapidb

Browse source
This commit is contained in:
Neil Alexander 2022-02-16 12:13:32 +00:00
parent a251000dd1 fa1e12b503
commit 9aa5e8dd48
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncapi/consumers/roomserver.go
View file

@ -16,6 +16,7 @@ package consumers
import (
"context"
"database/sql"
"encoding/json"
"fmt"
@ -307,7 +308,9 @@ func (s *OutputRoomEventConsumer) onRetireInviteEvent(
ctx context.Context, msg api.OutputRetireInviteEvent,
) {
pduPos, err := s.db.RetireInviteEvent(ctx, msg.EventID)
if err != nil {
// It's possible we just haven't heard of this invite yet, so
// we should not panic if we try to retire it.
if err != nil && err != sql.ErrNoRows {
sentry.CaptureException(err)
// panic rather than continue with an inconsistent database
log.WithFields(log.Fields{