summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-09 13:31:07 +0100
committerGitHub <noreply@github.com>2016-09-09 13:31:07 +0100
commit6b54fa81de7a63277d1ce4c3c91bc9c9756a7ee4 (patch)
treef3cb026764bd7b7418642b9fc9297e3569e2d90f /synapse/replication
parentMerge pull request #1090 from matrix-org/erikj/transaction_queue_check (diff)
parentUse the previous MAX value if any to set the stream_id (diff)
downloadsynapse-6b54fa81de7a63277d1ce4c3c91bc9c9756a7ee4.tar.xz
Merge pull request #1089 from matrix-org/markjh/direct_to_device_stream
Track the max device stream_id in a separate table,
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/slave/storage/deviceinbox.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/slave/storage/deviceinbox.py b/synapse/replication/slave/storage/deviceinbox.py

index 251078ba57..3bfd5e8213 100644 --- a/synapse/replication/slave/storage/deviceinbox.py +++ b/synapse/replication/slave/storage/deviceinbox.py
@@ -23,7 +23,7 @@ class SlavedDeviceInboxStore(BaseSlavedStore): def __init__(self, db_conn, hs): super(SlavedDeviceInboxStore, self).__init__(db_conn, hs) self._device_inbox_id_gen = SlavedIdTracker( - db_conn, "device_inbox", "stream_id", + db_conn, "device_max_stream_id", "stream_id", ) self._device_inbox_stream_cache = StreamChangeCache( "DeviceInboxStreamChangeCache",