diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-16 11:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 11:37:53 +0100 |
| commit | 25c2332071f9f26111a54e099b9884b4a382ac2f (patch) | |
| tree | c388750ddc395cf25d44337d1897a133bb7e0b1e /synapse/push | |
| parent | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ... (diff) | |
| parent | Use cached get_user_by_access_token in slaves (diff) | |
| download | synapse-25c2332071f9f26111a54e099b9884b4a382ac2f.tar.xz | |
Merge pull request #1010 from matrix-org/erikj/refactor_deletions
Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/pusherpool.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py index 5853ec36a9..54c0f1b849 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -102,14 +102,14 @@ class PusherPool: yield self.remove_pusher(p['app_id'], p['pushkey'], p['user_name']) @defer.inlineCallbacks - def remove_pushers_by_user(self, user_id, except_token_ids=[]): + def remove_pushers_by_user(self, user_id, except_access_token_id=None): all = yield self.store.get_all_pushers() logger.info( - "Removing all pushers for user %s except access tokens ids %r", - user_id, except_token_ids + "Removing all pushers for user %s except access tokens id %r", + user_id, except_access_token_id ) for p in all: - if p['user_name'] == user_id and p['access_token'] not in except_token_ids: + if p['user_name'] == user_id and p['access_token'] != except_access_token_id: logger.info( "Removing pusher for app id %s, pushkey %s, user %s", p['app_id'], p['pushkey'], p['user_name'] |