summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-09-13 16:32:48 -0600
committerGitHub <noreply@github.com>2018-09-13 16:32:48 -0600
commitad9198cc3490be9784685cb01fca7076a06eb0ce (patch)
tree40f481e5169d8102d857c285d30e35c7cd44dc12
parentmerge (#3576) (diff)
parentCreate 3860.misc (diff)
downloadsynapse-ad9198cc3490be9784685cb01fca7076a06eb0ce.tar.xz
Merge pull request #3860 from matrix-org/travis/typo-1
Fix minor typo in exception
-rw-r--r--changelog.d/3860.misc1
-rw-r--r--synapse/replication/tcp/streams.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/3860.misc b/changelog.d/3860.misc
new file mode 100644
index 0000000000..364239d3e3
--- /dev/null
+++ b/changelog.d/3860.misc
@@ -0,0 +1 @@
+Fix typo in replication stream exception.
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,