summary refs log tree commit diff
path: root/scripts/federation_client.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2015-02-12 20:03:29 +0000
committerMatthew Hodgson <matthew@arasphere.net>2015-02-12 20:03:29 +0000
commit16c6b860ac345296c2ddddc747159731046a6e62 (patch)
tree0c80c119afa32617a9c238639aca8dee971ba025 /scripts/federation_client.py
parentMerge pull request #69 from matrix-org/hotfixes-v0.7.0a (diff)
parentFix logging (diff)
downloadsynapse-16c6b860ac345296c2ddddc747159731046a6e62.tar.xz
Merge pull request #70 from matrix-org/exception-fixes
Exception fixes
Diffstat (limited to 'scripts/federation_client.py')
-rw-r--r--scripts/federation_client.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/federation_client.py b/scripts/federation_client.py
index 3139c61761..ea62dceb36 100644
--- a/scripts/federation_client.py
+++ b/scripts/federation_client.py
@@ -97,8 +97,11 @@ def lookup(destination, path):
     if ":" in destination:
         return "https://%s%s" % (destination, path)
     else:
-        srv = srvlookup.lookup("matrix", "tcp", destination)[0]
-        return "https://%s:%d%s" % (srv.host, srv.port, path)
+        try:
+            srv = srvlookup.lookup("matrix", "tcp", destination)[0]
+            return "https://%s:%d%s" % (srv.host, srv.port, path)
+        except:
+            return "https://%s:%d%s" % (destination, 8448, path)
 
 def get_json(origin_name, origin_key, destination, path):
     request_json = {