diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-24 17:01:34 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-24 17:01:34 +0100 |
| commit | 288702170d6fc8b44926856b37e4a0e1bb5b2ac4 (patch) | |
| tree | c4819aaad46052f885540513b87e807a7d2e6cc9 /synapse/crypto/keyring.py | |
| parent | Merge branch 'develop' into key_distribution (diff) | |
| download | synapse-288702170d6fc8b44926856b37e4a0e1bb5b2ac4.tar.xz | |
Add config for setting the perspective servers
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index d248776bc1..f7ae227916 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -42,7 +42,7 @@ class Keyring(object): self.clock = hs.get_clock() self.client = hs.get_http_client() self.config = hs.get_config() - self.perspective_servers = {} + self.perspective_servers = self.config.perspectives self.hs = hs @defer.inlineCallbacks @@ -111,6 +111,10 @@ class Keyring(object): ) break except: + logging.info( + "Unable to getting key %r for %r from %r", + key_ids, server_name, perspective_name, + ) pass limiter = yield get_retry_limiter( |