diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-07-29 10:13:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 10:13:01 +0100 |
| commit | a679a01dbe329ba28348ada0c24667b186bec331 (patch) | |
| tree | cc15550c20eb2369634351a05adcd8c9fe965f7d /synapse/push | |
| parent | Merge pull request #965 from matrix-org/kegan/comment-push-actions-fn (diff) | |
| parent | Fix SQL to supply arguments in the same order (diff) | |
| download | synapse-a679a01dbe329ba28348ada0c24667b186bec331.tar.xz | |
Merge pull request #966 from matrix-org/markjh/fix_push
Create separate methods for getting messages to push
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/emailpusher.py | 5 | ||||
| -rw-r--r-- | synapse/push/httppusher.py | 3 |
2 files changed, 4 insertions, 4 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 diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 2acc6cc214..9a7db61220 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -141,7 +141,8 @@ class HttpPusher(object): run once per pusher. """ - unprocessed = yield self.store.get_unread_push_actions_for_user_in_range( + fn = self.store.get_unread_push_actions_for_user_in_range_for_http + unprocessed = yield fn( self.user_id, self.last_stream_ordering, self.max_stream_ordering ) |