diff options
| author | Erik Johnston <erik@matrix.org> | 2021-01-21 15:09:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-01-21 15:09:30 +0000 |
| commit | b249f002b8d3f7fc7476b5e8f18f9e8d70c32fd5 (patch) | |
| tree | 452bedd23325008822e50a2b502ba1ab431648f4 /synapse/storage/databases/main | |
| parent | Use execute_batch in more places (#9188) (diff) | |
| parent | Fix receipts or account data not being sent down sync (#9193) (diff) | |
| download | synapse-b249f002b8d3f7fc7476b5e8f18f9e8d70c32fd5.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.26.0' into develop
Diffstat (limited to 'synapse/storage/databases/main')
| -rw-r--r-- | synapse/storage/databases/main/account_data.py | 2 | ||||
| -rw-r--r-- | synapse/storage/databases/main/receipts.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/databases/main/account_data.py b/synapse/storage/databases/main/account_data.py index 68896f34af..a277a1ef13 100644 --- a/synapse/storage/databases/main/account_data.py +++ b/synapse/storage/databases/main/account_data.py @@ -68,7 +68,7 @@ class AccountDataWorkerStore(SQLBaseStore): # `StreamIdGenerator`, otherwise we use `SlavedIdTracker` which gets # updated over replication. (Multiple writers are not supported for # SQLite). - if hs.get_instance_name() in hs.config.worker.writers.events: + if hs.get_instance_name() in hs.config.worker.writers.account_data: self._account_data_id_gen = StreamIdGenerator( db_conn, "room_account_data", diff --git a/synapse/storage/databases/main/receipts.py b/synapse/storage/databases/main/receipts.py index e0e57f0578..e4843a202c 100644 --- a/synapse/storage/databases/main/receipts.py +++ b/synapse/storage/databases/main/receipts.py @@ -45,7 +45,7 @@ class ReceiptsWorkerStore(SQLBaseStore): self._receipts_id_gen = MultiWriterIdGenerator( db_conn=db_conn, db=database, - stream_name="account_data", + stream_name="receipts", instance_name=self._instance_name, tables=[("receipts_linearized", "instance_name", "stream_id")], sequence_name="receipts_sequence", @@ -61,7 +61,7 @@ class ReceiptsWorkerStore(SQLBaseStore): # `StreamIdGenerator`, otherwise we use `SlavedIdTracker` which gets # updated over replication. (Multiple writers are not supported for # SQLite). - if hs.get_instance_name() in hs.config.worker.writers.events: + if hs.get_instance_name() in hs.config.worker.writers.receipts: self._receipts_id_gen = StreamIdGenerator( db_conn, "receipts_linearized", "stream_id" ) |