Don't always hit get_server_verify_key_v1_direct

2015-05-19 13:43:34 +01:00 · 2015-05-19 13:43:34 +01:00 · 253f76a0a5
parent 19505e0392
commit 253f76a0a5
1 changed files with 10 additions and 5 deletions
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@ -164,9 +164,14 @@ class Keyring(object):
                    keys = yield self.get_server_verify_key_v2_direct(
                        server_name, key_ids
                    )
-                except:
-                    pass
+                except Exception as e:
+                    logging.info(
+                        "Unable to getting key %r for %r directly: %s %s",
+                        key_ids, server_name,
+                        type(e).__name__, str(e.message),
+                    )

+            if keys is None:
                keys = yield self.get_server_verify_key_v1_direct(
                    server_name, key_ids
                )