summary refs log tree commit diff
path: root/synapse/handlers/directory.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-03 14:26:35 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-03 14:26:52 +0100
commit7fc84c7019801f74514cfaeadc2e86508ff55ba3 (patch)
tree3f4cb6ea17bf5289d7eb1ed7d692dd274a4f9d95 /synapse/handlers/directory.py
parentSend unrecognized commands as text message (as before) (diff)
downloadsynapse-7fc84c7019801f74514cfaeadc2e86508ff55ba3.tar.xz
Make retrying requests on DNS failures configurable, and turn off retrying only in directory.get_association
Diffstat (limited to 'synapse/handlers/directory.py')
-rw-r--r--synapse/handlers/directory.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 7c89150d99..2e9c6b688b 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -18,6 +18,7 @@ from twisted.internet import defer
 from ._base import BaseHandler
 
 from synapse.api.errors import SynapseError
+from synapse.http.client import HttpClient
 
 import logging
 
@@ -68,7 +69,10 @@ class DirectoryHandler(BaseHandler):
             result = yield self.federation.make_query(
                 destination=room_alias.domain,
                 query_type="directory",
-                args={"room_alias": room_alias.to_string()},
+                args={
+                    "room_alias": room_alias.to_string(),
+                    HttpClient.RETRY_DNS_LOOKUP_FAILURES: False
+                }
             )
 
             if result and "room_id" in result and "servers" in result: