Something daring

synapse/federation/federation_client.py

@@ -217,13 +217,15 @@ class FederationClient(FederationBase):
             for p in transaction_data["pdus"]
         ]
 
-        # FIXME: We should handle signature failures more gracefully.
-        pdus[:] = await make_deferred_yieldable(
-            defer.gatherResults(
-                self._check_sigs_and_hashes(room_version, pdus), consumeErrors=True,
-            ).addErrback(unwrapFirstError)
+        pdus[:] = await self._check_sigs_and_hash_and_fetch(
+            dest,
+            list(pdus),
+            outlier=True,
+            room_version=room_version,
         )
 
+        logger.info("DDD pdus ended up as: %s", pdus)
+
         return pdus
 
     async def get_pdu(

synapse/http/matrixfederationclient.py

@@ -441,6 +441,7 @@ class MatrixFederationHttpClient(object):
 
                     headers_dict[b"Authorization"] = auth_headers
 
+                    """
                     logger.debug(
                         "{%s} [%s] Sending request: %s %s; timeout %fs",
                         request.txn_id,
@@ -449,6 +450,7 @@ class MatrixFederationHttpClient(object):
                         url_str,
                         _sec_timeout,
                     )
+                    """
 
                     outgoing_requests_counter.labels(request.method).inc()
 

synapse/logging/utils.py

@@ -22,6 +22,7 @@ _TIME_FUNC_ID = 0
 
 
 def _log_debug_as_f(f, msg, msg_args):
+    return
     name = f.__module__
     logger = logging.getLogger(name)
 

synapse/util/__init__.py

@@ -32,6 +32,7 @@ json_encoder = json.JSONEncoder(separators=(",", ":"))
 def unwrapFirstError(failure):
     # defer.gatherResults and DeferredLists wrap failures.
     failure.trap(defer.FirstError)
+    logger.info("DDD failure.value.subFailure: %s", failure.value.subFailure)
     return failure.value.subFailure