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

Merge branch 'erikj/pdu_check' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2016-09-01 14:40:36 +01:00
parent 44982606ee 516a272aca
commit f4778d4cd9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/federation/federation_client.py
View File

@ -269,7 +269,7 @@ class FederationClient(FederationBase):
pdu_attempts = self.pdu_destination_tried.setdefault(event_id, {}) pdu_attempts = self.pdu_destination_tried.setdefault(event_id, {})
pdu = None signed_pdu = None
for destination in destinations: for destination in destinations:
now = self._clock.time_msec() now = self._clock.time_msec()
last_attempt = pdu_attempts.get(destination, 0) last_attempt = pdu_attempts.get(destination, 0)
@ -299,7 +299,7 @@ class FederationClient(FederationBase):
pdu = pdu_list[0] pdu = pdu_list[0]
# Check signatures are correct. # Check signatures are correct.
pdu = yield self._check_sigs_and_hashes([pdu])[0] signed_pdu = yield self._check_sigs_and_hashes([pdu])[0]
break break
@ -322,10 +322,10 @@ class FederationClient(FederationBase):
) )
continue continue
if self._get_pdu_cache is not None and pdu: if self._get_pdu_cache is not None and signed_pdu:
self._get_pdu_cache[event_id] = pdu self._get_pdu_cache[event_id] = signed_pdu
defer.returnValue(pdu) defer.returnValue(signed_pdu)
@defer.inlineCallbacks @defer.inlineCallbacks
@log_function @log_function