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

Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/syncunreadcount

Browse source
This commit is contained in:
Till Faelligen 2022-09-26 10:46:15 +02:00
parent 0b7eca3f77 3c416517b0
commit 125f3e64de
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/installation/4_database.md
View file

@ -16,6 +16,9 @@ Dendrite can automatically populate the database with the relevant tables and in
it is not capable of creating the databases themselves. You will need to create the databases it is not capable of creating the databases themselves. You will need to create the databases
manually. manually.
The databases **must** be created with UTF-8 encoding configured or you will likely run into problems
with your Dendrite deployment.
At this point, you can choose to either use a single database for all Dendrite components, At this point, you can choose to either use a single database for all Dendrite components,
or you can run each component with its own separate database: or you can run each component with its own separate database:
@ -65,7 +68,7 @@ sudo -u postgres createuser -P dendrite
Create the database itself, using the `dendrite` role from above: Create the database itself, using the `dendrite` role from above:
```bash ```bash
sudo -u postgres createdb -O dendrite dendrite sudo -u postgres createdb -O dendrite -E UTF-8 dendrite
``` ```
### Multiple database creation ### Multiple database creation
@ -85,7 +88,7 @@ The following eight components require a database. In this example they will be
```bash ```bash
for i in appservice federationapi mediaapi mscs roomserver syncapi keyserver userapi; do for i in appservice federationapi mediaapi mscs roomserver syncapi keyserver userapi; do
sudo -u postgres createdb -O dendrite dendrite_$i sudo -u postgres createdb -O dendrite -E UTF-8 dendrite_$i
done done
``` ```

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

@ -777,7 +777,7 @@ func (d *Database) GetPushers(
func (d *Database) RemovePusher( func (d *Database) RemovePusher(
ctx context.Context, appid, pushkey, localpart string, ctx context.Context, appid, pushkey, localpart string,
) error { ) error {
return d.Writer.Do(nil, nil, func(txn *sql.Tx) error { return d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
err := d.Pushers.DeletePusher(ctx, txn, appid, pushkey, localpart) err := d.Pushers.DeletePusher(ctx, txn, appid, pushkey, localpart)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil return nil
@ -792,7 +792,7 @@ func (d *Database) RemovePusher(
func (d *Database) RemovePushers( func (d *Database) RemovePushers(
ctx context.Context, appid, pushkey string, ctx context.Context, appid, pushkey string,
) error { ) error {
return d.Writer.Do(nil, nil, func(txn *sql.Tx) error { return d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
return d.Pushers.DeletePushers(ctx, txn, appid, pushkey) return d.Pushers.DeletePushers(ctx, txn, appid, pushkey)
}) })
} }