From fd8fb32bdd70b0ad68666e0f39a95ac90f9b1c27 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 25 Apr 2019 21:08:12 +0100
Subject: [PATCH] remove extraneous exception logging

---
 synapse/crypto/keyring.py             | 48 ++++++++++++++++++---------
 synapse/federation/federation_base.py |  4 +--
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index b6d1b4cf0b..d8ba870cca 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -114,38 +114,54 @@ class Keyring(object):
                 server_name. The deferreds run their callbacks in the sentinel
                 logcontext.
         """
+        # a list of VerifyKeyRequests
         verify_requests = []
+        handle = preserve_fn(_handle_key_deferred)
 
-        for server_name, json_object in server_and_json:
+        def process(server_name, json_object):
+            """Process an entry in the request list
 
+            Given a (server_name, json_object) pair from the request list,
+            adds a key request to verify_requests, and returns a deferred which will
+            complete or fail (in the sentinel context) when verification completes.
+            """
             key_ids = signature_ids(json_object, server_name)
+
             if not key_ids:
-                deferred = defer.fail(SynapseError(
-                    400,
-                    "Not signed by %s" % (server_name, ),
-                    Codes.UNAUTHORIZED,
-                ))
-            else:
-                deferred = defer.Deferred()
+                return defer.fail(
+                    SynapseError(
+                        400,
+                        "Not signed by %s" % (server_name,),
+                        Codes.UNAUTHORIZED,
+                    )
+                )
 
             logger.debug("Verifying for %s with key_ids %s",
                          server_name, key_ids)
 
+            # add the key request to the queue, but don't start it off yet.
             verify_request = VerifyKeyRequest(
-                server_name, key_ids, json_object, deferred
+                server_name, key_ids, json_object, defer.Deferred(),
             )
-
             verify_requests.append(verify_request)
 
-        run_in_background(self._start_key_lookups, verify_requests)
+            # now run _handle_key_deferred, which will wait for the key request
+            # to complete and then do the verification.
+            #
+            # We want _handle_key_request to log to the right context, so we
+            # wrap it with preserve_fn (aka run_in_background)
+            return handle(verify_request)
 
-        # Pass those keys to handle_key_deferred so that the json object
-        # signatures can be verified
-        handle = preserve_fn(_handle_key_deferred)
-        return [
-            handle(rq) for rq in verify_requests
+        results = [
+            process(server_name, json_object)
+            for server_name, json_object in server_and_json
         ]
 
+        if verify_requests:
+            run_in_background(self._start_key_lookups, verify_requests)
+
+        return results
+
     @defer.inlineCallbacks
     def _start_key_lookups(self, verify_requests):
         """Sets off the key fetches for each verify request
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py
index 1d641337da..832e2bdb9b 100644
--- a/synapse/federation/federation_base.py
+++ b/synapse/federation/federation_base.py
@@ -274,7 +274,7 @@ def _check_sigs_on_pdus(keyring, room_version, pdus):
             "event id %s: unable to verify signature for sender %s: %s",
             pdu_to_check.pdu.event_id,
             pdu_to_check.sender_domain,
-            e,
+            e.getErrorMessage(),
         )
         return e
 
@@ -305,7 +305,7 @@ def _check_sigs_on_pdus(keyring, room_version, pdus):
             logger.warning(
                 "event id %s: unable to verify signature for event id domain: %s",
                 pdu_to_check.pdu.event_id,
-                e,
+                e.getErrorMessage(),
             )
             return e