summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-14 17:02:22 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-14 17:02:22 +0100
commit30883d840956c8efc4451465d4a4baca424dbff1 (patch)
tree4802c2d0d641881264cbe8f8302da744896e9025 /synapse/push
parentMerge pull request #219 from matrix-org/erikj/dictionary_cache (diff)
parentMerge password checking implementations (diff)
downloadsynapse-30883d840956c8efc4451465d4a4baca424dbff1.tar.xz
Merge pull request #221 from matrix-org/auth
Simplify LoginHander and AuthHandler
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/pusherpool.py11
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']