OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2553 from matrix-org/rav/fix_500_on_event_send 

Fix 500 error when we get an error handling a PDU
pull/2557/head
Richard van der Hoff 2017-10-18 11:25:44 +01:00 committed by GitHub
parent b5dbbac308 582bd19ee9
commit 69994c385a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/federation/federation_server.py
View File

@ -192,7 +192,6 @@ class FederationServer(FederationBase):
pdu_results[event_id] = {} pdu_results[event_id] = {}
except FederationError as e: except FederationError as e:
logger.warn("Error handling PDU %s: %s", event_id, e) logger.warn("Error handling PDU %s: %s", event_id, e)
self.send_failure(e, transaction.origin)
pdu_results[event_id] = {"error": str(e)} pdu_results[event_id] = {"error": str(e)}
except Exception as e: except Exception as e:
pdu_results[event_id] = {"error": str(e)} pdu_results[event_id] = {"error": str(e)}