summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-04 16:28:12 +0000
committerErik Johnston <erik@matrix.org>2015-02-04 16:28:12 +0000
commitae46f10fc5dba0f81518e3144ab8d9ed7a7d03bc (patch)
treeca543f43db03346741aae11c9b575e66a39dbf7a /synapse/handlers
parentWhen returning lists of servers from alias lookups, put the current server fi... (diff)
downloadsynapse-ae46f10fc5dba0f81518e3144ab8d9ed7a7d03bc.tar.xz
Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 0876589e31..a968a87360 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -288,7 +288,7 @@ class FederationHandler(BaseHandler):
         logger.debug("Joining %s to %s", joinee, room_id)
 
         pdu = yield self.replication_layer.make_join(
-            target_host,
+            [target_host],
             room_id,
             joinee
         )
@@ -331,7 +331,7 @@ class FederationHandler(BaseHandler):
             new_event = builder.build()
 
             ret = yield self.replication_layer.send_join(
-                target_host,
+                [target_host],
                 new_event
             )