summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-27 15:51:43 +0100
committerErik Johnston <erik@matrix.org>2016-07-28 15:41:26 +0100
commit6ede23ff1b956e72b3a2864e85accb8c05fff6f0 (patch)
treed2289e21c432fb03f3c8830b855cb8c323077876 /synapse/replication
parentSplit out a FederationReader process (diff)
downloadsynapse-6ede23ff1b956e72b3a2864e85accb8c05fff6f0.tar.xz
Add more key storage funcs into slave store
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/slave/storage/keys.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/synapse/replication/slave/storage/keys.py b/synapse/replication/slave/storage/keys.py
index c1c895439d..dd2ae49e48 100644
--- a/synapse/replication/slave/storage/keys.py
+++ b/synapse/replication/slave/storage/keys.py
@@ -13,17 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from twisted.internet import defer
-
 from ._base import BaseSlavedStore
 from synapse.storage import DataStore
 from synapse.storage.keys import KeyStore
 
 
 class SlavedKeyStore(BaseSlavedStore):
-    # TODO: use the cached version and invalidate deleted tokens
-    get_all_server_verify_keys = defer.inlineCallbacks(KeyStore.__dict__[
-        "get_all_server_verify_keys"
-    ].orig)
+    _get_server_verify_key = KeyStore.__dict__[
+        "_get_server_verify_key"
+    ]
 
     get_server_verify_keys = DataStore.get_server_verify_keys.__func__
+    store_server_verify_key = DataStore.store_server_verify_key.__func__
+
+    get_server_certificate = DataStore.get_server_certificate.__func__
+    store_server_certificate = DataStore.store_server_certificate.__func__
+
+    get_server_keys_json = DataStore.get_server_keys_json.__func__
+    store_server_keys_json = DataStore.store_server_keys_json.__func__