diff options
author | Silke <silke@slxh.eu> | 2017-12-17 14:15:30 +0100 |
---|---|---|
committer | Silke <silke@slxh.eu> | 2017-12-18 20:00:42 +0100 |
commit | df0f60279636b978aae456bbd639a5f3b2adf3ba (patch) | |
tree | c1c1097431e4398de9a02107f9a98075efd230df /synapse/app/user_dir.py | |
parent | Remove logger argument and do not catch replication listener (diff) | |
download | synapse-df0f60279636b978aae456bbd639a5f3b2adf3ba.tar.xz |
Implement listen_tcp method in remaining workers
Signed-off-by: Silke <silke@slxh.eu>
Diffstat (limited to '')
-rw-r--r-- | synapse/app/user_dir.py | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index be661a70c7..a48c4a2ae6 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -131,17 +131,16 @@ class UserDirectoryServer(HomeServer): root_resource = create_resource_tree(resources, Resource()) - for address in bind_addresses: - reactor.listenTCP( - port, - SynapseSite( - "synapse.access.http.%s" % (site_tag,), - site_tag, - listener_config, - root_resource, - ), - interface=address + _base.listen_tcp( + bind_addresses, + port, + SynapseSite( + "synapse.access.http.%s" % (site_tag,), + site_tag, + listener_config, + root_resource, ) + ) logger.info("Synapse user_dir now listening on port %d", port) @@ -150,18 +149,15 @@ class UserDirectoryServer(HomeServer): if listener["type"] == "http": self._listen_http(listener) elif listener["type"] == "manhole": - bind_addresses = listener["bind_addresses"] - - for address in bind_addresses: - reactor.listenTCP( - listener["port"], - manhole( - username="matrix", - password="rabbithole", - globals={"hs": self}, - ), - interface=address + _base.listen_tcp( + listener["bind_addresses"], + listener["port"], + manhole( + username="matrix", + password="rabbithole", + globals={"hs": self}, ) + ) else: logger.warn("Unrecognized listener type: %s", listener["type"]) |