diff options
| author | Neil Johnson <neil@matrix.org> | 2018-11-02 15:24:00 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-11-02 15:24:00 +0000 |
| commit | cdb3aaee1c8fa5f25375675b71e9b7211301c950 (patch) | |
| tree | 67ddb5b116349e4eee7f9d729b709b8a546b0758 /synapse/push/emailpusher.py | |
| parent | Merge branch 'neilj/create_support_user' of github.com:matrix-org/synapse int... (diff) | |
| parent | Merge pull request #4137 from matrix-org/erikj/clean_up_events (diff) | |
| download | synapse-cdb3aaee1c8fa5f25375675b71e9b7211301c950.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_support_user
Diffstat (limited to 'synapse/push/emailpusher.py')
| -rw-r--r-- | synapse/push/emailpusher.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index f369124258..50e1007d84 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -85,7 +85,10 @@ class EmailPusher(object): self.timed_call = None def on_new_notifications(self, min_stream_ordering, max_stream_ordering): - self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering) + if self.max_stream_ordering: + self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering) + else: + self.max_stream_ordering = max_stream_ordering self._start_processing() def on_new_receipts(self, min_stream_id, max_stream_id): |