diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-20 14:01:41 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-20 14:01:41 +0000 |
| commit | ebf6c08a472073780b62fb6f222b664f553e1782 (patch) | |
| tree | 07ee18b241aa2efe4df3bfcb12bd5f81b7cb0a71 /synapse/app | |
| parent | remove random half-line (diff) | |
| parent | Refactor the HTTP clients a little. (diff) | |
| download | synapse-ebf6c08a472073780b62fb6f222b664f553e1782.tar.xz | |
Merge branch 'http_client_refactor' into pushers
Diffstat (limited to 'synapse/app')
| -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 de16d8a2e1..8f8d566191 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.client 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() |