summary refs log tree commit diff
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2019-01-18 10:02:08 +0200
committerJason Robinson <jasonr@matrix.org>2019-01-23 10:32:41 +0200
commita17bac171f301e54d6bd3d4c769f4f005c38f112 (patch)
tree45780f2c3d2cae1764390ebd52ccd5cd1c0bec9e
parentAdd tests for the openid lister for FederationReaderServer (diff)
downloadsynapse-a17bac171f301e54d6bd3d4c769f4f005c38f112.tar.xz
Make SynapseHomeServer _http_listener 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>
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f3ac3d19f0..5652c6201c 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -130,6 +130,7 @@ class SynapseHomeServer(HomeServer):
                     self.version_string,
                 ),
                 self.tls_server_context_factory,
+                reactor=self.get_reactor(),
             )
 
         else:
@@ -142,7 +143,8 @@ class SynapseHomeServer(HomeServer):
                     listener_config,
                     root_resource,
                     self.version_string,
-                )
+                ),
+                reactor=self.get_reactor(),
             )
         logger.info("Synapse now listening on port %d", port)