summary refs log tree commit diff
path: root/synapse/app/client_reader.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-02-08 17:25:57 +0000
committerGitHub <noreply@github.com>2019-02-08 17:25:57 +0000
commit9cd33d2f4bc14a165f693e2d3dfe231179e968e8 (patch)
treebf72a066e4158ce6dd893b3a2f969a2d6dfb6be6 /synapse/app/client_reader.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-9cd33d2f4bc14a165f693e2d3dfe231179e968e8.tar.xz
Deduplicate some code in synapse.app (#4567)
Diffstat (limited to 'synapse/app/client_reader.py')
-rw-r--r--synapse/app/client_reader.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py
index f8a417cb60..a9d2147022 100644
--- a/synapse/app/client_reader.py
+++ b/synapse/app/client_reader.py
@@ -25,7 +25,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.site import SynapseSite
 from synapse.metrics import RegistryProxy
@@ -173,17 +172,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-client-reader", config)