hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-04 02:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash

Browse source
This commit is contained in:
Neil Alexander 2021-12-09 10:24:51 +00:00
parent 645e3f5833
commit 1c117cf768
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roomserver/internal/api.go
View file

@ -58,12 +58,20 @@ func NewRoomserverAPI(
PerspectiveServerNames: perspectiveServerNames, PerspectiveServerNames: perspectiveServerNames,
ACLs: serverACLs, ACLs: serverACLs,
Producer: producer, Producer: producer,
OutputRoomEventTopic: outputRoomEventTopic,
Queryer: &query.Queryer{ Queryer: &query.Queryer{
DB: roomserverDB, DB: roomserverDB,
Cache: caches, Cache: caches,
ServerName: cfg.Matrix.ServerName, ServerName: cfg.Matrix.ServerName,
ServerACLs: serverACLs, ServerACLs: serverACLs,
}, },
Inputer: &input.Inputer{
DB: roomserverDB,
OutputRoomEventTopic: outputRoomEventTopic,
Producer: producer,
ServerName: cfg.Matrix.ServerName,
ACLs: serverACLs,
},
// perform-er structs get initialised when we have a federation sender to use // perform-er structs get initialised when we have a federation sender to use
} }
return a return a

1
roomserver/internal/input/input_events.go
View file

@ -102,6 +102,7 @@ func (r *Inputer) processRoomEvent(
// First of all, check that the auth events of the event are known. // First of all, check that the auth events of the event are known.
// If they aren't then we will ask the federation API for them. // If they aren't then we will ask the federation API for them.
if err := r.checkForMissingAuthEvents(ctx, input); err != nil { if err := r.checkForMissingAuthEvents(ctx, input); err != nil {
logrus.WithError(err).Error("XXX: r.checkForMissingAuthEvents")
return "", fmt.Errorf("r.checkForMissingAuthEvents: %w", err) return "", fmt.Errorf("r.checkForMissingAuthEvents: %w", err)
} }