diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-28 17:18:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 17:18:33 +0000 |
commit | 5d976c0c7ce210916ec28b2112fe4c17e42694e8 (patch) | |
tree | 9b47c480286769a4b1ea3e48ca6dfdb1b9aca05a /synapse/app/frontend_proxy.py | |
parent | Fix UPSERTs on SQLite 3.24+ (#4477) (diff) | |
download | synapse-5d976c0c7ce210916ec28b2112fe4c17e42694e8.tar.xz |
Fix worker TLS (#4492)
* load cert * changelog * fix
Diffstat (limited to 'synapse/app/frontend_proxy.py')
-rw-r--r-- | synapse/app/frontend_proxy.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index f5c61dec5b..d9ef6edc3c 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -241,23 +241,23 @@ def start(config_options): database_engine = create_engine(config.database_config) - tls_server_context_factory = context_factory.ServerContextFactory(config) - tls_client_options_factory = context_factory.ClientTLSOptionsFactory(config) - ss = FrontendProxyServer( config.server_name, db_config=config.database_config, - tls_server_context_factory=tls_server_context_factory, - tls_client_options_factory=tls_client_options_factory, config=config, version_string="Synapse/" + get_version_string(synapse), database_engine=database_engine, ) ss.setup() - ss.start_listening(config.worker_listeners) 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) |