diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-01-24 13:57:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 13:57:51 +0000 |
| commit | 4a6e8638433581000465734ad121285b7fd4b615 (patch) | |
| tree | 4319ccc24c707f154937174c781b1329e128e7e1 /synapse | |
| parent | Generate the debian config during build (#4444) (diff) | |
| parent | Look up the right SRV record (diff) | |
| download | synapse-4a6e8638433581000465734ad121285b7fd4b615.tar.xz | |
Merge pull request #4464 from matrix-org/rav/fix_srv_lookup
MatrixFederationAgent: Look up the right SRV record
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/federation/matrix_federation_agent.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py index 64c780a341..0ec28c6696 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py @@ -101,7 +101,8 @@ class MatrixFederationAgent(object): if port is not None: target = (host, port) else: - server_list = yield self._srv_resolver.resolve_service(server_name_bytes) + service_name = b"_matrix._tcp.%s" % (server_name_bytes, ) + server_list = yield self._srv_resolver.resolve_service(service_name) if not server_list: target = (host, 8448) logger.debug("No SRV record for %s, using %s", host, target) |