diff options
| author | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
| commit | 0bba2799b6eeaf95b52ba9c4f2831def37d8effd (patch) | |
| tree | f4da51c1d29e54bfa06c4935a188245592a99a90 /synapse/push | |
| parent | s/underride/override/ in the rule_id too (diff) | |
| parent | Merge pull request #1015 from matrix-org/erikj/preview_url_fixes (diff) | |
| download | synapse-0bba2799b6eeaf95b52ba9c4f2831def37d8effd.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
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'] |