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

Use writer to avoid locked databases

Browse source
This commit is contained in:
Till Faelligen 2022-09-09 13:27:19 +02:00
parent 26a639fa19
commit 9300caf243
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
userapi/storage/shared/storage.go
View file

@ -195,10 +195,14 @@ func (d *Database) QueryPushRules(
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to marshal default push rules: %w", err) return nil, fmt.Errorf("failed to marshal default push rules: %w", err)
} }
if err := d.AccountDatas.InsertAccountData(ctx, nil, localpart, "", "m.push_rules", json.RawMessage(prbs)); err != nil { err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
return nil, fmt.Errorf("failed to save default push rules: %w", err) if dbErr := d.AccountDatas.InsertAccountData(ctx, txn, localpart, "", "m.push_rules", prbs); dbErr != nil {
} return fmt.Errorf("failed to save default push rules: %w", dbErr)
return pushRuleSets, nil }
return nil
})
return pushRuleSets, err
} }
var pushRules pushrules.AccountRuleSets var pushRules pushrules.AccountRuleSets