summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-15 17:47:36 +0000
committerMark Haines <mark.haines@matrix.org>2016-03-15 17:47:36 +0000
commitee32d622cec56f2ab7b11577d15e4b805477d13f (patch)
tree8bf9ac5d991fcf0d53cfdc51c867cc455877de2d /synapse
parentMerge branch 'develop' into markjh/pushers_stream (diff)
downloadsynapse-ee32d622cec56f2ab7b11577d15e4b805477d13f.tar.xz
Fix a couple of errors when deleting pushers
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/pusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py
index 29da3bbd13..87b2ac5773 100644
--- a/synapse/storage/pusher.py
+++ b/synapse/storage/pusher.py
@@ -136,7 +136,7 @@ class PusherStore(SQLBaseStore):
     @defer.inlineCallbacks
     def delete_pusher_by_app_id_pushkey_user_id(self, app_id, pushkey, user_id):
         def delete_pusher_txn(txn, stream_id):
-            self._simple_delete_one(
+            self._simple_delete_one_txn(
                 txn,
                 "pushers",
                 {"app_id": app_id, "pushkey": pushkey, "user_name": user_id}
@@ -145,7 +145,7 @@ class PusherStore(SQLBaseStore):
                 txn,
                 "deleted_pushers",
                 {"app_id": app_id, "pushkey": pushkey, "user_id": user_id},
-                {"stream_id", stream_id},
+                {"stream_id": stream_id},
             )
         with self._pushers_id_gen.get_next() as stream_id:
             yield self.runInteraction(