sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Put redactions/filters in the writer goroutine (#1378)

Browse source 
* Put redactions in the writer goroutine

* Update filters on writer goroutine
This commit is contained in:
Kegsay 2020-09-01 20:35:38 +01:00 committed by GitHub
parent a9f4d83d30
commit 82a9617659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
syncapi/storage/shared/syncserver.go
View file

@ -525,7 +525,13 @@ func (d *Database) GetFilter(
func (d *Database) PutFilter( func (d *Database) PutFilter(
ctx context.Context, localpart string, filter *gomatrixserverlib.Filter, ctx context.Context, localpart string, filter *gomatrixserverlib.Filter,
) (string, error) { ) (string, error) {
return d.Filter.InsertFilter(ctx, filter, localpart) var filterID string
var err error
err = d.Writer.Do(nil, nil, func(txn *sql.Tx) error {
filterID, err = d.Filter.InsertFilter(ctx, filter, localpart)
return err
})
return filterID, err
} }
func (d *Database) IncrementalSync( func (d *Database) IncrementalSync(
@ -587,7 +593,10 @@ func (d *Database) RedactEvent(ctx context.Context, redactedEventID string, reda
} }
newEvent := ev.Headered(redactedBecause.RoomVersion) newEvent := ev.Headered(redactedBecause.RoomVersion)
return d.OutputEvents.UpdateEventJSON(ctx, &newEvent) err = d.Writer.Do(nil, nil, func(txn *sql.Tx) error {
return d.OutputEvents.UpdateEventJSON(ctx, &newEvent)
})
return err
} }
// getResponseWithPDUsForCompleteSync creates a response and adds all PDUs needed // getResponseWithPDUsForCompleteSync creates a response and adds all PDUs needed