diff options
author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
commit | b37e8c9572ef90367bef9e70b66150fdfe243e5d (patch) | |
tree | 1207a22a9529d48603317826926bc02866a474a0 /synapse/app/client_reader.py | |
parent | isort (diff) | |
parent | Merge branch 'develop' into neilj/room_capabilities (diff) | |
download | synapse-b37e8c9572ef90367bef9e70b66150fdfe243e5d.tar.xz |
Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into neilj/room_capabilities
Diffstat (limited to 'synapse/app/client_reader.py')
-rw-r--r-- | synapse/app/client_reader.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 76aed8c60a..f8a417cb60 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -164,23 +164,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 = ClientReaderServer( 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) |