summary refs log tree commit diff
path: root/synapse/storage/pusher.py
diff options
context:
space:
mode:
authorPaul Evans <leonerd@leonerd.org.uk>2015-03-11 17:55:31 +0000
committerPaul Evans <leonerd@leonerd.org.uk>2015-03-11 17:55:31 +0000
commitd33a3b91c391578fe6809d4028c0e8481dab00cd (patch)
tree46fc80ca894883a97ffb4bf520630f83b3d081ae /synapse/storage/pusher.py
parentAgain, underscore, not hyphen (diff)
parentAppease pep8 (diff)
downloadsynapse-d33a3b91c391578fe6809d4028c0e8481dab00cd.tar.xz
Merge pull request #107 from matrix-org/add_desc_to_storage_execute
Add desc to storage execute
Diffstat (limited to 'synapse/storage/pusher.py')
-rw-r--r--synapse/storage/pusher.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py

index 6622b4d18a..587dada68f 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py
@@ -37,7 +37,8 @@ class PusherStore(SQLBaseStore): ) rows = yield self._execute( - None, sql, app_id_and_pushkey[0], app_id_and_pushkey[1] + "get_pushers_by_app_id_and_pushkey", None, sql, + app_id_and_pushkey[0], app_id_and_pushkey[1] ) ret = [ @@ -70,7 +71,7 @@ class PusherStore(SQLBaseStore): "FROM pushers" ) - rows = yield self._execute(None, sql) + rows = yield self._execute("get_all_pushers", None, sql) ret = [ {