summary refs log tree commit diff
path: root/synapse/replication/tcp/streams.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-11-03 12:14:24 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-11-03 12:14:24 +0000
commit6e7488ce1166ffb1f70777b4db2e9008f3303a04 (patch)
tree4cd62ccc22a7eb9630b875e18e05cf4017f62218 /synapse/replication/tcp/streams.py
parentMerge pull request #4047 from matrix-org/michaelkaye/dinsic_allow_user_direct... (diff)
parentMerge branch 'release-v0.33.8' (diff)
downloadsynapse-6e7488ce1166ffb1f70777b4db2e9008f3303a04.tar.xz
merge master into dinsic, again...
Diffstat (limited to 'synapse/replication/tcp/streams.py')
-rw-r--r--synapse/replication/tcp/streams.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/streams.py b/synapse/replication/tcp/streams.py

index 55fe701c5c..c1e626be3f 100644 --- a/synapse/replication/tcp/streams.py +++ b/synapse/replication/tcp/streams.py
@@ -196,7 +196,7 @@ class Stream(object): ) if len(rows) >= MAX_EVENTS_BEHIND: - raise Exception("stream %s has fallen behined" % (self.NAME)) + raise Exception("stream %s has fallen behind" % (self.NAME)) else: rows = yield self.update_function( from_token, current_token,