Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If we're yielding don't add errback

This commit is contained in:
Erik Johnston 2015-03-02 11:50:43 +00:00
parent 23d9bd1d74
commit 29481690c5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/federation/federation_server.py
View File

@ -117,16 +117,12 @@ class FederationServer(FederationBase):
for pdu in pdu_list: for pdu in pdu_list:
d = self._handle_new_pdu(transaction.origin, pdu) d = self._handle_new_pdu(transaction.origin, pdu)
def handle_failure(failure):
failure.trap(FederationError)
self.send_failure(failure.value, transaction.origin)
return failure
d.addErrback(handle_failure)
try: try:
yield d yield d
results.append({}) results.append({})
except FederationError as e:
self.send_failure(e, transaction.origin)
results.append({"error": str(e)})
except Exception as e: except Exception as e:
results.append({"error": str(e)}) results.append({"error": str(e)})