diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-17 13:23:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-17 13:23:44 +0100 |
| commit | afef6f5d16d9600e11cc2e33efcbcc5fa8b9509f (patch) | |
| tree | ccb3670a75ce04f1a0e87c68bd99f6a8cc02bdc0 /synapse/push | |
| parent | Batch _get_linearized_receipts_for_rooms (diff) | |
| parent | Fix bug where we were leaking None into state event lists (diff) | |
| download | synapse-afef6f5d16d9600e11cc2e33efcbcc5fa8b9509f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/pusherpool.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py index 0ab2f65972..e012c565ee 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -94,17 +94,14 @@ class PusherPool: self.remove_pusher(p['app_id'], p['pushkey'], p['user_name']) @defer.inlineCallbacks - def remove_pushers_by_user_access_token(self, user_id, not_access_token_id): + def remove_pushers_by_user(self, user_id): all = yield self.store.get_all_pushers() logger.info( - "Removing all pushers for user %s except access token %s", - user_id, not_access_token_id + "Removing all pushers for user %s", + user_id, ) for p in all: - if ( - p['user_name'] == user_id and - p['access_token'] != not_access_token_id - ): + if p['user_name'] == user_id: logger.info( "Removing pusher for app id %s, pushkey %s, user %s", p['app_id'], p['pushkey'], p['user_name'] |