summary refs log tree commit diff
path: root/synapse/storage/pusher.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-02-13 16:18:34 +0000
committerDavid Baker <dave@matrix.org>2015-02-13 16:18:34 +0000
commit64def4f9536ffe54813e6c509226b02db4f1d9e5 (patch)
tree3fb402a072f8576f544f776dd630d2556b0dba82 /synapse/storage/pusher.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUpdate pushers by app id and pushkey, not user id and pushkey (diff)
downloadsynapse-64def4f9536ffe54813e6c509226b02db4f1d9e5.tar.xz
Merge branch 'hotfixes-0.7.0e' into develop
Diffstat (limited to 'synapse/storage/pusher.py')
-rw-r--r--synapse/storage/pusher.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py
index e2a662a6c7..6622b4d18a 100644
--- a/synapse/storage/pusher.py
+++ b/synapse/storage/pusher.py
@@ -126,27 +126,27 @@ class PusherStore(SQLBaseStore):
         )
 
     @defer.inlineCallbacks
-    def update_pusher_last_token(self, user_name, pushkey, last_token):
+    def update_pusher_last_token(self, app_id, pushkey, last_token):
         yield self._simple_update_one(
             PushersTable.table_name,
-            {'user_name': user_name, 'pushkey': pushkey},
+            {'app_id': app_id, 'pushkey': pushkey},
             {'last_token': last_token}
         )
 
     @defer.inlineCallbacks
-    def update_pusher_last_token_and_success(self, user_name, pushkey,
+    def update_pusher_last_token_and_success(self, app_id, pushkey,
                                              last_token, last_success):
         yield self._simple_update_one(
             PushersTable.table_name,
-            {'user_name': user_name, 'pushkey': pushkey},
+            {'app_id': app_id, 'pushkey': pushkey},
             {'last_token': last_token, 'last_success': last_success}
         )
 
     @defer.inlineCallbacks
-    def update_pusher_failing_since(self, user_name, pushkey, failing_since):
+    def update_pusher_failing_since(self, app_id, pushkey, failing_since):
         yield self._simple_update_one(
             PushersTable.table_name,
-            {'user_name': user_name, 'pushkey': pushkey},
+            {'app_id': app_id, 'pushkey': pushkey},
             {'failing_since': failing_since}
         )