Move ClientTLSOptionsFactory init out of refresh_certificates

changelog.d/4611.misc

@@ -0,0 +1 @@
+Move ClientTLSOptionsFactory init out of refresh_certificates

synapse/app/_base.py

@@ -216,9 +216,6 @@ def refresh_certificate(hs):
     logging.info("Loading certificate from disk...")
     hs.config.read_certificate_from_disk()
     hs.tls_server_context_factory = context_factory.ServerContextFactory(hs.config)
-    hs.tls_client_options_factory = context_factory.ClientTLSOptionsFactory(
-        hs.config
-    )
     logging.info("Certificate loaded.")
 
     if hs._listening_services:

synapse/http/matrixfederationclient.py

@@ -44,6 +44,7 @@
     RequestSendFailed,
     SynapseError,
 )
+from synapse.crypto import context_factory
 from synapse.http.federation.matrix_federation_agent import MatrixFederationAgent
 from synapse.util.async_helpers import timeout_deferred
 from synapse.util.logcontext import make_deferred_yieldable
@@ -174,9 +175,11 @@ def __init__(self, hs):
         self.server_name = hs.hostname
         reactor = hs.get_reactor()
 
+        tls_client_options_factory = context_factory.ClientTLSOptionsFactory(hs.config)
+
         self.agent = MatrixFederationAgent(
             hs.get_reactor(),
-            hs.tls_client_options_factory,
+            tls_client_options_factory,
         )
         self.clock = hs.get_clock()
         self._store = hs.get_datastore()