diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-05 13:43:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-05 13:44:42 +0000 |
| commit | e1515c3e91f2117adc3976b5e606728560ce9e96 (patch) | |
| tree | d131964da3a0556d420d72481ab662fdc716696d /synapse/federation | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien... (diff) | |
| download | synapse-e1515c3e91f2117adc3976b5e606728560ce9e96.tar.xz | |
Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index eb36ec040b..9923b3fc0d 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -264,7 +264,9 @@ class FederationClient(FederationBase): logger.debug("Got response to make_join: %s", pdu_dict) - defer.returnValue(self.event_from_pdu_json(pdu_dict)) + defer.returnValue( + (destination, self.event_from_pdu_json(pdu_dict)) + ) break except CodeMessageException: raise @@ -313,6 +315,7 @@ class FederationClient(FederationBase): defer.returnValue({ "state": signed_state, "auth_chain": signed_auth, + "origin": destination, }) except CodeMessageException: raise |