diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 16:24:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 16:24:00 +0000 |
| commit | 32090aee169aafc9da4efa176b50a5fc8ede68d2 (patch) | |
| tree | c7606c2aecdce27c83e0e2dc95393a95761c7934 /synapse/crypto | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-32090aee169aafc9da4efa176b50a5fc8ede68d2.tar.xz | |
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
Diffstat (limited to 'synapse/crypto')
| -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 ) |