diff options
author | Erik Johnston <erik@matrix.org> | 2015-06-03 10:15:27 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-06-03 10:17:37 +0100 |
commit | 2ef2f6d593693351f399688c425add7a804f28d6 (patch) | |
tree | 6c8b9383d10912cccde9d44f401b818f469cea95 /synapse/rest/media | |
parent | Log where a request came from in federation (diff) | |
download | synapse-2ef2f6d593693351f399688c425add7a804f28d6.tar.xz |
SYN-403: Make content repository use its own http client.
Diffstat (limited to 'synapse/rest/media')
-rw-r--r-- | synapse/rest/media/v1/base_resource.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/base_resource.py b/synapse/rest/media/v1/base_resource.py index 4af5f73878..9a60b777ca 100644 --- a/synapse/rest/media/v1/base_resource.py +++ b/synapse/rest/media/v1/base_resource.py @@ -15,6 +15,7 @@ from .thumbnailer import Thumbnailer +from synapse.http.matrixfederationclient import MatrixFederationHttpClient from synapse.http.server import respond_with_json from synapse.util.stringutils import random_string from synapse.api.errors import ( @@ -52,7 +53,7 @@ class BaseMediaResource(Resource): def __init__(self, hs, filepaths): Resource.__init__(self) self.auth = hs.get_auth() - self.client = hs.get_http_client() + self.client = MatrixFederationHttpClient(hs) self.clock = hs.get_clock() self.server_name = hs.hostname self.store = hs.get_datastore() |