summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-10-18 11:25:44 +0100
committerGitHub <noreply@github.com>2017-10-18 11:25:44 +0100
commit69994c385a2964c576c75af93f2ea280556db24b (patch)
tree01b73d635b29250cf536172d2d84daf40f1940f9 /synapse
parentMerge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevels (diff)
parentFix 500 error when we get an error handling a PDU (diff)
downloadsynapse-69994c385a2964c576c75af93f2ea280556db24b.tar.xz
Merge pull request #2553 from matrix-org/rav/fix_500_on_event_send
Fix 500 error when we get an error handling a PDU
Diffstat (limited to 'synapse')
-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)}