summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-02-11 18:03:30 +0000
committerGitHub <noreply@github.com>2019-02-11 18:03:30 +0000
commit5d27730a73d01bd3ff7eb42a21f2f024493c5b89 (patch)
tree1417404058dddff402e87c40f57850b8d7dd9937 /synapse/server.py
parentMerge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating (diff)
downloadsynapse-5d27730a73d01bd3ff7eb42a21f2f024493c5b89.tar.xz
Move ClientTLSOptionsFactory init out of refresh_certificates (#4611)
It's nothing to do with refreshing the certificates. No idea why it was here.

Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py

index a2cf8a91cd..8615b67ad4 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -31,6 +31,7 @@ from synapse.api.filtering import Filtering from synapse.api.ratelimiting import Ratelimiter from synapse.appservice.api import ApplicationServiceApi from synapse.appservice.scheduler import ApplicationServiceScheduler +from synapse.crypto import context_factory from synapse.crypto.keyring import Keyring from synapse.events.builder import EventBuilderFactory from synapse.events.spamcheck import SpamChecker @@ -367,7 +368,10 @@ class HomeServer(object): return PusherPool(self) def build_http_client(self): - return MatrixFederationHttpClient(self) + tls_client_options_factory = context_factory.ClientTLSOptionsFactory( + self.config + ) + return MatrixFederationHttpClient(self, tls_client_options_factory) def build_db_pool(self): name = self.db_config["name"]