diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
| commit | 8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5 (patch) | |
| tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/app/homeserver.py | |
| parent | Fix pep8 codestyle warnings (diff) | |
| parent | Merge branch 'develop' into http_client_refactor (diff) | |
| download | synapse-8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5.tar.xz | |
Merge pull request #20 from matrix-org/http_client_refactor
Http client refactor
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 133b4521ba..855fe8e170 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -26,7 +26,7 @@ from twisted.web.server import Site from synapse.http.server import JsonResource, RootRedirect from synapse.http.content_repository import ContentRepoResource from synapse.http.server_key_resource import LocalKey -from synapse.http.client import MatrixHttpClient +from synapse.http.matrixfederationclient import MatrixFederationHttpClient from synapse.api.urls import ( CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX, SERVER_KEY_PREFIX, @@ -51,7 +51,7 @@ logger = logging.getLogger(__name__) class SynapseHomeServer(HomeServer): def build_http_client(self): - return MatrixHttpClient(self) + return MatrixFederationHttpClient(self) def build_resource_for_client(self): return JsonResource() |