summary refs log tree commit diff
path: root/synapse/replication/tcp
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-12-04 09:58:38 +0000
committerErik Johnston <erik@matrix.org>2023-12-04 09:58:38 +0000
commitafc82ecb44db1c7497defc9bb370a1b99f88fea6 (patch)
tree3bcfb88b3345febe49d8d3e6fc474d4cb76c32ae /synapse/replication/tcp
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentModuleAPI SSO auth callbacks (#15207) (diff)
downloadsynapse-afc82ecb44db1c7497defc9bb370a1b99f88fea6.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/replication/tcp')
-rw-r--r--synapse/replication/tcp/streams/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py

index 1f6402c2da..7514429d99 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py
@@ -621,7 +621,7 @@ class ToDeviceStream(_StreamFromIdGen): super().__init__( hs.get_instance_name(), store.get_all_new_device_messages, - store._device_inbox_id_gen, + store._to_device_msg_id_gen, )