summary refs log tree commit diff
path: root/synapse/replication/tcp/streams.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-18 19:02:45 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-18 19:02:45 +0100
commit38ead946a9571f1916228c3d96aad48b6b57ef89 (patch)
treecdc68014a0368b266796c83f78b9a02e41c0fe07 /synapse/replication/tcp/streams.py
parenttowncrier (diff)
parentMerge pull request #3879 from matrix-org/matthew/fix-autojoin (diff)
downloadsynapse-38ead946a9571f1916228c3d96aad48b6b57ef89.tar.xz
Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links
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,