summary refs log tree commit diff
path: root/synapse/http/federation/matrix_federation_agent.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-24 15:51:59 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-24 15:51:59 +0000
commit08e25ffa0cbbaee0a092f95648b4529ff081d56f (patch)
tree193be1b1dd6f0c7d628ee99b14cfec413685b9f9 /synapse/http/federation/matrix_federation_agent.py
parentMerge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes (diff)
parentMerge pull request #4461 from matrix-org/anoa/room_dir_quick_fix (diff)
downloadsynapse-08e25ffa0cbbaee0a092f95648b4529ff081d56f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/federation/matrix_federation_agent.py')
-rw-r--r--synapse/http/federation/matrix_federation_agent.py3
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)