summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2019-01-17 15:58:27 +0200
committerJason Robinson <jasonr@matrix.org>2019-01-23 10:32:41 +0200
commit4f8f41c824dc326903863625ce79e5386ad0f8e1 (patch)
treed50d0dc49468307086ba396beccd5f2403df6ae4 /synapse/app
parentAdd parameterized Python module to test dependencies (diff)
downloadsynapse-4f8f41c824dc326903863625ce79e5386ad0f8e1.tar.xz
Make FederationReaderServer _http_listen use self.get_reactor()
For all the homeserver classes, only the FrontendProxyServer passes
its reactor when doing the http listen. Looking at previous PR's looks
like this was introduced to make it possible to write a test, otherwise
when you try to run a test with the test homeserver it tries to
do a real bind to a port. Passing the reactor that the homeserver
is instantiated with should probably be the right thing to do anyway?

Signed-off-by: Jason Robinson <jasonr@matrix.org>
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/federation_reader.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py
index 228a297fb8..ea594f0f1a 100644
--- a/synapse/app/federation_reader.py
+++ b/synapse/app/federation_reader.py
@@ -99,7 +99,8 @@ class FederationReaderServer(HomeServer):
                 listener_config,
                 root_resource,
                 self.version_string,
-            )
+            ),
+            reactor=self.get_reactor()
         )
 
         logger.info("Synapse federation reader now listening on port %d", port)