diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-05 10:35:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 10:35:40 +0100 |
| commit | 2615c6bd9e5456c5aefc23a9c89a4346b8afc6b0 (patch) | |
| tree | 95c44526b58c19dbfe75804d850a4dfff0daaf21 /synapse/crypto | |
| parent | Rename VerifyKeyRequest.deferred field (#5343) (diff) | |
| download | synapse-2615c6bd9e5456c5aefc23a9c89a4346b8afc6b0.tar.xz | |
Clean up debug logging (#5347)
Remove some spurious stuff, clarify some other stuff
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/event_signing.py | 6 | ||||
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/crypto/event_signing.py b/synapse/crypto/event_signing.py index 1dfa727fcf..99a586655b 100644 --- a/synapse/crypto/event_signing.py +++ b/synapse/crypto/event_signing.py @@ -31,7 +31,11 @@ logger = logging.getLogger(__name__) def check_event_content_hash(event, hash_algorithm=hashlib.sha256): """Check whether the hash for this PDU matches the contents""" name, expected_hash = compute_content_hash(event.get_pdu_json(), hash_algorithm) - logger.debug("Expecting hash: %s", encode_base64(expected_hash)) + logger.debug( + "Verifying content hash on %s (expecting: %s)", + event.event_id, + encode_base64(expected_hash), + ) # some malformed events lack a 'hashes'. Protect against it being missing # or a weird type by basically treating it the same as an unhashed event. diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 8e1d666db1..e94e71bdad 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -866,10 +866,6 @@ def _handle_key_deferred(verify_request): json_object = verify_request.json_object - logger.debug( - "Got key %s %s:%s for server %s, verifying" - % (key_id, verify_key.alg, verify_key.version, server_name) - ) try: verify_signed_json(json_object, server_name, verify_key) except SignatureVerifyException as e: |