summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-08 14:08:16 +0100
committerDavid Baker <dave@matrix.org>2016-04-08 14:08:16 +0100
commit7b6d51948241090799d3bb9f52a9082b29a27d73 (patch)
treea39b2a5e4255306a5821280d6dbc9e903ddeb4e6 /synapse
parentUnsafe process should call itself if the max has changed (diff)
downloadsynapse-7b6d51948241090799d3bb9f52a9082b29a27d73.tar.xz
Make sure max stream ordering only increases
Diffstat (limited to '')
-rw-r--r--synapse/push/httppusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 6ef8bf62b3..38b758e6af 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -86,7 +86,7 @@ class HttpPusher(object):
     @defer.inlineCallbacks
     def on_new_notifications(self, min_stream_ordering, max_stream_ordering):
         with Measure(self.clock, "push.on_new_notifications"):
-            self.max_stream_ordering = max_stream_ordering
+            self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering)
             yield self._process()
 
     @defer.inlineCallbacks