diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-20 17:49:48 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-20 17:49:48 +0000 |
| commit | f1c7f8e8131d6e5531e23e3bc2cd57ab7d1881ae (patch) | |
| tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/crypto/keyring.py | |
| parent | Separate out the matrix http client completely because just about all of its ... (diff) | |
| parent | Fix pep8 codestyle warnings (diff) | |
| download | synapse-f1c7f8e8131d6e5531e23e3bc2cd57ab7d1881ae.tar.xz | |
Merge branch 'develop' into http_client_refactor
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 694aed3a7d..ceb03ce6c2 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -135,7 +135,7 @@ class Keyring(object): time_now_ms = self.clock.time_msec() - self.store.store_server_certificate( + yield self.store.store_server_certificate( server_name, server_name, time_now_ms, @@ -143,7 +143,7 @@ class Keyring(object): ) for key_id, key in verify_keys.items(): - self.store.store_server_verify_key( + yield self.store.store_server_verify_key( server_name, server_name, time_now_ms, key ) |