diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-02-08 17:25:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-08 17:25:57 +0000 |
commit | 9cd33d2f4bc14a165f693e2d3dfe231179e968e8 (patch) | |
tree | bf72a066e4158ce6dd893b3a2f969a2d6dfb6be6 /synapse/app/frontend_proxy.py | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-9cd33d2f4bc14a165f693e2d3dfe231179e968e8.tar.xz |
Deduplicate some code in synapse.app (#4567)
Diffstat (limited to 'synapse/app/frontend_proxy.py')
-rw-r--r-- | synapse/app/frontend_proxy.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index d9ef6edc3c..d5b954361d 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -26,7 +26,6 @@ from synapse.app import _base from synapse.config._base import ConfigError from synapse.config.homeserver import HomeServerConfig from synapse.config.logger import setup_logging -from synapse.crypto import context_factory from synapse.http.server import JsonResource from synapse.http.servlet import RestServlet, parse_json_object_from_request from synapse.http.site import SynapseSite @@ -250,17 +249,7 @@ def start(config_options): ) ss.setup() - - def start(): - ss.config.read_certificate_from_disk() - ss.tls_server_context_factory = context_factory.ServerContextFactory(config) - ss.tls_client_options_factory = context_factory.ClientTLSOptionsFactory( - config - ) - ss.start_listening(config.worker_listeners) - ss.get_datastore().start_profiling() - - reactor.callWhenRunning(start) + reactor.callWhenRunning(_base.start, ss, config.worker_listeners) _base.start_worker_reactor("synapse-frontend-proxy", config) |