diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-02-11 18:03:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-11 18:03:30 +0000 |
commit | 5d27730a73d01bd3ff7eb42a21f2f024493c5b89 (patch) | |
tree | 1417404058dddff402e87c40f57850b8d7dd9937 /synapse/http/matrixfederationclient.py | |
parent | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating (diff) | |
download | synapse-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/http/matrixfederationclient.py')
-rw-r--r-- | synapse/http/matrixfederationclient.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 5ee4d528d2..3c24bf3805 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -168,7 +168,7 @@ class MatrixFederationHttpClient(object): requests. """ - def __init__(self, hs): + def __init__(self, hs, tls_client_options_factory): self.hs = hs self.signing_key = hs.config.signing_key[0] self.server_name = hs.hostname @@ -176,7 +176,7 @@ class MatrixFederationHttpClient(object): 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() |