diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-20 11:27:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-20 11:27:31 +0100 |
| commit | 099ce4bc3824c4390b4ff56c809e6b0a1e8ee896 (patch) | |
| tree | 6b444bb9f1ba4644181d6f0c322069d08b38a501 | |
| parent | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails (diff) | |
| parent | Store the 'last_token' in the db, even if we processed no events (diff) | |
| download | synapse-099ce4bc3824c4390b4ff56c809e6b0a1e8ee896.tar.xz | |
Merge pull request #231 from matrix-org/erikj/pushers_store_last_token
Push: store the 'last_token' in the db, even if we processed no events
| -rw-r--r-- | synapse/push/__init__.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 36f450c31d..13002e0db4 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -294,6 +294,12 @@ class Pusher(object): if not single_event: self.last_token = chunk['end'] logger.debug("Event stream timeout for pushkey %s", self.pushkey) + yield self.store.update_pusher_last_token( + self.app_id, + self.pushkey, + self.user_name, + self.last_token + ) return if not self.alive: @@ -345,7 +351,7 @@ class Pusher(object): if processed: self.backoff_delay = Pusher.INITIAL_BACKOFF self.last_token = chunk['end'] - self.store.update_pusher_last_token_and_success( + yield self.store.update_pusher_last_token_and_success( self.app_id, self.pushkey, self.user_name, @@ -354,7 +360,7 @@ class Pusher(object): ) if self.failing_since: self.failing_since = None - self.store.update_pusher_failing_since( + yield self.store.update_pusher_failing_since( self.app_id, self.pushkey, self.user_name, @@ -362,7 +368,7 @@ class Pusher(object): else: if not self.failing_since: self.failing_since = self.clock.time_msec() - self.store.update_pusher_failing_since( + yield self.store.update_pusher_failing_since( self.app_id, self.pushkey, self.user_name, @@ -380,7 +386,7 @@ class Pusher(object): self.user_name, self.pushkey) self.backoff_delay = Pusher.INITIAL_BACKOFF self.last_token = chunk['end'] - self.store.update_pusher_last_token( + yield self.store.update_pusher_last_token( self.app_id, self.pushkey, self.user_name, @@ -388,7 +394,7 @@ class Pusher(object): ) self.failing_since = None - self.store.update_pusher_failing_since( + yield self.store.update_pusher_failing_since( self.app_id, self.pushkey, self.user_name, |