diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-02 11:04:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-02 11:04:48 +0100 |
| commit | 657847e4c6b955911768e7d3025ac1b245208882 (patch) | |
| tree | a826411c63b4691a7356ce2740e7b4438b8ead78 /synapse/federation | |
| parent | Limit the length of state chains (diff) | |
| parent | Merge pull request #1061 from matrix-org/erikj/linearize_resolution (diff) | |
| download | synapse-657847e4c6b955911768e7d3025ac1b245208882.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 67ad3dfd37..627acc6a4f 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -269,7 +269,7 @@ class FederationClient(FederationBase): pdu_attempts = self.pdu_destination_tried.setdefault(event_id, {}) - pdu = None + signed_pdu = None for destination in destinations: now = self._clock.time_msec() last_attempt = pdu_attempts.get(destination, 0) @@ -299,7 +299,7 @@ class FederationClient(FederationBase): pdu = pdu_list[0] # Check signatures are correct. - pdu = yield self._check_sigs_and_hashes([pdu])[0] + signed_pdu = yield self._check_sigs_and_hashes([pdu])[0] break @@ -322,10 +322,10 @@ class FederationClient(FederationBase): ) continue - if self._get_pdu_cache is not None and pdu: - self._get_pdu_cache[event_id] = pdu + if self._get_pdu_cache is not None and signed_pdu: + self._get_pdu_cache[event_id] = signed_pdu - defer.returnValue(pdu) + defer.returnValue(signed_pdu) @defer.inlineCallbacks @log_function |