diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-07-28 20:24:24 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-07-28 20:24:24 +0100 |
| commit | 0a7d3cd00f8b7e3ad0ba458c3ab9b40a2496545b (patch) | |
| tree | bf6554d8ebc3b0a8f1155e85884ada5ad49a138e /synapse/push/emailpusher.py | |
| parent | Merge pull request #965 from matrix-org/kegan/comment-push-actions-fn (diff) | |
| download | synapse-0a7d3cd00f8b7e3ad0ba458c3ab9b40a2496545b.tar.xz | |
Create separate methods for getting messages to push
for the email and http pushers rather than trying to make a single method that will work with their conflicting requirements. The http pusher needs to get the messages in ascending stream order, and doesn't want to miss a message. The email pusher needs to get the messages in descending timestamp order, and doesn't mind if it misses messages.
Diffstat (limited to 'synapse/push/emailpusher.py')
| -rw-r--r-- | synapse/push/emailpusher.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index 12a3ec7fd8..e224b68291 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -140,9 +140,8 @@ class EmailPusher(object): being run. """ start = 0 if INCLUDE_ALL_UNREAD_NOTIFS else self.last_stream_ordering - unprocessed = yield self.store.get_unread_push_actions_for_user_in_range( - self.user_id, start, self.max_stream_ordering - ) + fn = self.store.get_unread_push_actions_for_user_in_range_for_email + unprocessed = yield fn(self.user_id, start, self.max_stream_ordering) soonest_due_at = None |