|
@@ -183,24 +183,24 @@ def start(config_options):
|
|
|
# Force the pushers to start since they will be disabled in the main config
|
|
|
config.send_federation = True
|
|
|
|
|
|
- tls_server_context_factory = context_factory.ServerContextFactory(config)
|
|
|
- tls_client_options_factory = context_factory.ClientTLSOptionsFactory(config)
|
|
|
-
|
|
|
- ps = FederationSenderServer(
|
|
|
+ ss = FederationSenderServer(
|
|
|
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,
|
|
|
)
|
|
|
|
|
|
- ps.setup()
|
|
|
- ps.start_listening(config.worker_listeners)
|
|
|
+ ss.setup()
|
|
|
|
|
|
def start():
|
|
|
- ps.get_datastore().start_profiling()
|
|
|
+ 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)
|
|
|
_base.start_worker_reactor("synapse-federation-sender", config)
|