summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-10-17 20:46:55 +0100
committerRichard van der Hoff <richard@matrix.org>2017-10-17 20:52:40 +0100
commit582bd19ee9de4850010b58e0bb0e2a93f01b2f44 (patch)
tree8ff0549bdc7e1f3ec1d657bcb9e20381f6c89e23
parentDoc some more dynamic Homeserver methods (diff)
downloadsynapse-582bd19ee9de4850010b58e0bb0e2a93f01b2f44.tar.xz
Fix 500 error when we get an error handling a PDU
FederationServer doesn't have a send_failure (and nor does its subclass,
ReplicationLayer), so this was failing.

I'm not really sure what the idea behind send_failure is, given (a) we don't do
anything at the other end with it except log it, and (b) we also send back the
failure via the transaction response. I suspect there's a whole lot of dead
code around it, but for now I'm just removing the broken bit.
-rw-r--r--synapse/federation/federation_server.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index a8034bddc6..e15228e70b 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -192,7 +192,6 @@ class FederationServer(FederationBase):
                     pdu_results[event_id] = {}
                 except FederationError as e:
                     logger.warn("Error handling PDU %s: %s", event_id, e)
-                    self.send_failure(e, transaction.origin)
                     pdu_results[event_id] = {"error": str(e)}
                 except Exception as e:
                     pdu_results[event_id] = {"error": str(e)}