From d240796dedcfae1f6929c1501e7e335df417cfaf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 31 May 2016 17:20:07 +0100
Subject: Basic, un-cached support for secondary_directory_servers

---
 synapse/federation/federation_client.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'synapse/federation/federation_client.py')

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 37ee469fa2..ba8d71c050 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -24,6 +24,7 @@ from synapse.api.errors import (
     CodeMessageException, HttpResponseException, SynapseError,
 )
 from synapse.util import unwrapFirstError
+from synapse.util.async import concurrently_execute
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.util.logutils import log_function
 from synapse.events import FrozenEvent
@@ -550,6 +551,26 @@ class FederationClient(FederationBase):
 
         raise RuntimeError("Failed to send to any server.")
 
+    @defer.inlineCallbacks
+    def get_public_rooms(self, destinations):
+        results_by_server = {}
+
+        @defer.inlineCallbacks
+        def _get_result(s):
+            if s == self.server_name:
+                defer.returnValue()
+
+            try:
+                result = yield self.transport_layer.get_public_rooms(s)
+                results_by_server[s] = result
+            except:
+                logger.exception("Error getting room list from server %r", s)
+
+
+        yield concurrently_execute(_get_result, destinations, 3)
+
+        defer.returnValue(results_by_server)
+
     @defer.inlineCallbacks
     def query_auth(self, destination, room_id, event_id, local_auth):
         """
-- 
cgit 1.5.1


From 963e3ed2828f6d1e704678af971ceffff3076115 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 31 May 2016 17:22:53 +0100
Subject: Apparently I am not permitted to have two blank lines here

---
 synapse/federation/federation_client.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'synapse/federation/federation_client.py')

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index ba8d71c050..d835c1b038 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -566,7 +566,6 @@ class FederationClient(FederationBase):
             except:
                 logger.exception("Error getting room list from server %r", s)
 
-
         yield concurrently_execute(_get_result, destinations, 3)
 
         defer.returnValue(results_by_server)
-- 
cgit 1.5.1