diff options
| author | David Baker <dave@matrix.org> | 2015-02-13 16:16:16 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-02-13 16:16:16 +0000 |
| commit | 8d5cce62ab4bbb2333f01abb9edf7e94f6d6f7d4 (patch) | |
| tree | e037c01666948ce383278bab1bc09934853ba0ce /synapse/push | |
| parent | Bump version (diff) | |
| download | synapse-8d5cce62ab4bbb2333f01abb9edf7e94f6d6f7d4.tar.xz | |
Update pushers by app id and pushkey, not user id and pushkey
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 0659a1cb9b..0fb3e4f7f3 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -237,7 +237,7 @@ class Pusher(object): self.user_name, config, timeout=0) self.last_token = chunk['end'] self.store.update_pusher_last_token( - self.user_name, self.pushkey, self.last_token) + self.app_id, self.pushkey, self.last_token) logger.info("Pusher %s for user %s starting from token %s", self.pushkey, self.user_name, self.last_token) @@ -308,7 +308,7 @@ class Pusher(object): self.backoff_delay = Pusher.INITIAL_BACKOFF self.last_token = chunk['end'] self.store.update_pusher_last_token_and_success( - self.user_name, + self.app_id, self.pushkey, self.last_token, self.clock.time_msec() @@ -316,14 +316,14 @@ class Pusher(object): if self.failing_since: self.failing_since = None self.store.update_pusher_failing_since( - self.user_name, + self.app_id, self.pushkey, self.failing_since) else: if not self.failing_since: self.failing_since = self.clock.time_msec() self.store.update_pusher_failing_since( - self.user_name, + self.app_id, self.pushkey, self.failing_since ) @@ -340,14 +340,14 @@ class Pusher(object): self.backoff_delay = Pusher.INITIAL_BACKOFF self.last_token = chunk['end'] self.store.update_pusher_last_token( - self.user_name, + self.app_id, self.pushkey, self.last_token ) self.failing_since = None self.store.update_pusher_failing_since( - self.user_name, + self.app_id, self.pushkey, self.failing_since ) |