summary refs log tree commit diff
path: root/synapse/storage/keys.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/keys.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/keys.py')
-rw-r--r--synapse/storage/keys.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index 1f244019fc..09d1e63657 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -85,7 +85,9 @@ class KeyStore(SQLBaseStore):
             " AND key_id in (" + ",".join("?" for key_id in key_ids) + ")"
         )
 
-        rows = yield self._execute_and_decode(sql, server_name, *key_ids)
+        rows = yield self._execute_and_decode(
+            "get_server_verify_keys", sql, server_name, *key_ids
+        )
 
         keys = []
         for row in rows: